diff options
| author | Jakob Kaivo <jkk@ung.org> | 2019-02-25 21:03:15 -0500 |
|---|---|---|
| committer | Jakob Kaivo <jkk@ung.org> | 2019-02-25 21:03:15 -0500 |
| commit | 21f6ab11f8554328772ac992ced6947b2b67df65 (patch) | |
| tree | e20f2f76cfef4b26518b997e4212c92847de5355 | |
| parent | f39b2c39bd8f5eff3e8e49271d8ff27e3d81c186 (diff) | |
make internal stuff "C version 0" so it gets pulled in properly
| -rw-r--r-- | .deps.mk | 2 | ||||
| -rw-r--r-- | .deps/libc.C_0 | 14 | ||||
| -rw-r--r-- | .deps/libc.mk | 12 | ||||
| -rw-r--r-- | .deps/libcurses.mk | 4 | ||||
| -rw-r--r-- | .deps/libm.mk | 7 | ||||
| -rw-r--r-- | .deps/libpthread.C_0 | 3 | ||||
| -rw-r--r-- | .deps/librt.mk | 3 | ||||
| -rw-r--r-- | mk.sh | 7 |
8 files changed, 26 insertions, 26 deletions
@@ -3779,6 +3779,7 @@ $(OBJDIR)/compile.o: ./src/regexp/compile.c $(CC) $(BASE_CFLAGS) $(CFLAGS) -c ./src/regexp/compile.c -o $@ +include $(TOPDIR)/.deps/libc.C_0 include $(TOPDIR)/.deps/libc.C_1 include $(TOPDIR)/.deps/libc.C_199409 include $(TOPDIR)/.deps/libc.C_199901 @@ -3796,5 +3797,6 @@ include $(TOPDIR)/.deps/libm.C_199901 include $(TOPDIR)/.deps/libm.POSIX_200112 include $(TOPDIR)/.deps/libm.XOPEN_4 include $(TOPDIR)/.deps/libm.XOPEN_400 +include $(TOPDIR)/.deps/libpthread.C_0 include $(TOPDIR)/.deps/librt.POSIX_199309 diff --git a/.deps/libc.C_0 b/.deps/libc.C_0 new file mode 100644 index 00000000..55a974e9 --- /dev/null +++ b/.deps/libc.C_0 @@ -0,0 +1,14 @@ +.POSIX: +libc_C_0_OBJS= \ + libc.a($(OBJDIR)/__libc_start.o) \ + libc.a($(OBJDIR)/__libc.o) \ + libc.a($(OBJDIR)/_XOPEN_SOURCE.o) \ + libc.a($(OBJDIR)/_POSIX_C_SOURCE.o) \ + libc.a($(OBJDIR)/_XOPEN_SOURCE_EXTENDED.o) \ + libc.a($(OBJDIR)/__syscall.o) \ + libc.a($(OBJDIR)/__libc_per_thread.o) \ + libc.a($(OBJDIR)/__errno.o) \ + libc.a($(OBJDIR)/__stderr.o) \ + libc.a($(OBJDIR)/__stdout.o) \ + libc.a($(OBJDIR)/__stdin.o) \ + libc.a($(OBJDIR)/__assert.o)
\ No newline at end of file diff --git a/.deps/libc.mk b/.deps/libc.mk deleted file mode 100644 index 67de539f..00000000 --- a/.deps/libc.mk +++ /dev/null @@ -1,12 +0,0 @@ -.POSIX: -libc.a: \ - $(libc_C_1_OBJS) \ - $(libc_C_199409_OBJS) \ - $(libc_C_199901_OBJS) \ - $(libc_POSIX_1_OBJS) \ - $(libc_POSIX_199309_OBJS) \ - $(libc_POSIX_2_OBJS) \ - $(libc_POSIX_200112_OBJS) \ - $(libc_POSIX_200809_OBJS) \ - $(libc_XOPEN_4_OBJS) \ - $(libc_XOPEN_400_OBJS)
\ No newline at end of file diff --git a/.deps/libcurses.mk b/.deps/libcurses.mk deleted file mode 100644 index 0a007b33..00000000 --- a/.deps/libcurses.mk +++ /dev/null @@ -1,4 +0,0 @@ -.POSIX: -libcurses.a: \ - $(libcurses_XOPEN_4_OBJS) \ - $(libcurses_XOPEN_400_OBJS)
\ No newline at end of file diff --git a/.deps/libm.mk b/.deps/libm.mk deleted file mode 100644 index 9e890dbc..00000000 --- a/.deps/libm.mk +++ /dev/null @@ -1,7 +0,0 @@ -.POSIX: -libm.a: \ - $(libm_C_1_OBJS) \ - $(libm_C_199901_OBJS) \ - $(libm_POSIX_200112_OBJS) \ - $(libm_XOPEN_4_OBJS) \ - $(libm_XOPEN_400_OBJS)
\ No newline at end of file diff --git a/.deps/libpthread.C_0 b/.deps/libpthread.C_0 new file mode 100644 index 00000000..f781cf84 --- /dev/null +++ b/.deps/libpthread.C_0 @@ -0,0 +1,3 @@ +.POSIX: +libpthread_C_0_OBJS= \ + libpthread.a($(OBJDIR)/__pthread_per_thread.o)
\ No newline at end of file diff --git a/.deps/librt.mk b/.deps/librt.mk deleted file mode 100644 index 8e0181f6..00000000 --- a/.deps/librt.mk +++ /dev/null @@ -1,3 +0,0 @@ -.POSIX: -librt.a: \ - $(librt_POSIX_199309_OBJS)
\ No newline at end of file @@ -227,6 +227,13 @@ make_deps_mk() { fi printf ' \\\n\t%s.a($(OBJDIR)/%s)' $LIB $OBJ >> "${DEPS}/${LIB}.XOPEN_${xver}" fi + + if [ -z "$cver" ] && [ -z "$pver" ] && [ -z "$xver" ]; then + if ! [ -f "${DEPS}/${LIB}.C_0" ]; then + printf '.POSIX:\n%s_C_0_OBJS=' "${LIB}" > "${DEPS}/${LIB}.C_0" + fi + printf ' \\\n\t%s.a($(OBJDIR)/%s)' $LIB $OBJ >> "${DEPS}/${LIB}.C_0" + fi fi done |