summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2003-07-02 20:51:30 +0000
committerru <ru@FreeBSD.org>2003-07-02 20:51:30 +0000
commite00593397e793d9ef231b938cf807f4c785efafc (patch)
tree83f75547483814fd10413215c912e43fc7555ca7 /lib
parent7d054a5c56b3d0da80ef1bc9dd099d21a9dfdd32 (diff)
downloadFreeBSD-src-e00593397e793d9ef231b938cf807f4c785efafc.zip
FreeBSD-src-e00593397e793d9ef231b938cf807f4c785efafc.tar.gz
Take thr_support.c out of SRCS so that it does not end up in libraries.
Record the missing dependency of thr_libc.So on the libc_pic.a library. OK'ed by: kan
Diffstat (limited to 'lib')
-rw-r--r--lib/libkse/Makefile6
-rw-r--r--lib/libkse/support/Makefile.inc5
-rw-r--r--lib/libpthread/Makefile6
-rw-r--r--lib/libpthread/support/Makefile.inc5
4 files changed, 16 insertions, 6 deletions
diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile
index 601c245..58fe061 100644
--- a/lib/libkse/Makefile
+++ b/lib/libkse/Makefile
@@ -35,3 +35,9 @@ PRECIOUSLIB= yes
.include "${.CURDIR}/thread/Makefile.inc"
.include <bsd.lib.mk>
+
+# Can't put thr_support.c in SRCS but want it in .depend.
+${DEPENDFILE}: thr_support.c
+
+# LIBC_PIC is defined only after <bsd.lib.mk> is included.
+thr_libc.So: ${LIBC_PIC}
diff --git a/lib/libkse/support/Makefile.inc b/lib/libkse/support/Makefile.inc
index 5c5d059..9f6783e 100644
--- a/lib/libkse/support/Makefile.inc
+++ b/lib/libkse/support/Makefile.inc
@@ -2,9 +2,8 @@
.PATH: ${.CURDIR}/support
-SRCS += thr_support.c
SOBJS+= thr_libc.So
+CLEANFILES+= thr_support.So
thr_libc.So: thr_support.So
- ${CC} -nostdlib -o ${.TARGET} -Wl,-x,-r ${.ALLSRC} -lc_pic
-
+ ${CC} -nostdlib -o ${.TARGET} -Wl,-r thr_support.So -lc_pic
diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile
index 601c245..58fe061 100644
--- a/lib/libpthread/Makefile
+++ b/lib/libpthread/Makefile
@@ -35,3 +35,9 @@ PRECIOUSLIB= yes
.include "${.CURDIR}/thread/Makefile.inc"
.include <bsd.lib.mk>
+
+# Can't put thr_support.c in SRCS but want it in .depend.
+${DEPENDFILE}: thr_support.c
+
+# LIBC_PIC is defined only after <bsd.lib.mk> is included.
+thr_libc.So: ${LIBC_PIC}
diff --git a/lib/libpthread/support/Makefile.inc b/lib/libpthread/support/Makefile.inc
index 5c5d059..9f6783e 100644
--- a/lib/libpthread/support/Makefile.inc
+++ b/lib/libpthread/support/Makefile.inc
@@ -2,9 +2,8 @@
.PATH: ${.CURDIR}/support
-SRCS += thr_support.c
SOBJS+= thr_libc.So
+CLEANFILES+= thr_support.So
thr_libc.So: thr_support.So
- ${CC} -nostdlib -o ${.TARGET} -Wl,-x,-r ${.ALLSRC} -lc_pic
-
+ ${CC} -nostdlib -o ${.TARGET} -Wl,-r thr_support.So -lc_pic
OpenPOWER on IntegriCloud