diff options
author | jdp <jdp@FreeBSD.org> | 1997-05-06 00:49:36 +0000 |
---|---|---|
committer | jdp <jdp@FreeBSD.org> | 1997-05-06 00:49:36 +0000 |
commit | af706d2990bc849297db6b64b18a11690dbe9ee4 (patch) | |
tree | 4e49389b3b01e362586895d48cd06a5b04d7666f | |
parent | 7394cdac990f67fec226d3af9c0cfd828880903f (diff) | |
download | FreeBSD-src-af706d2990bc849297db6b64b18a11690dbe9ee4.zip FreeBSD-src-af706d2990bc849297db6b64b18a11690dbe9ee4.tar.gz |
Bye bye CPLUSPLUSLIB hack! It's not needed any more.
Don't merge this into -2.2 unless you understand the dependencies on
c++rt0, bsd.lib.mk, and gcc -shared. I.e., let me do it.
-rw-r--r-- | gnu/lib/libg++/Makefile | 3 | ||||
-rw-r--r-- | gnu/lib/libstdc++/Makefile | 3 | ||||
-rw-r--r-- | lib/libc_r/uthread/Makefile.inc | 4 | ||||
-rw-r--r-- | lib/libkse/thread/Makefile.inc | 4 | ||||
-rw-r--r-- | lib/libpthread/thread/Makefile.inc | 4 |
5 files changed, 5 insertions, 13 deletions
diff --git a/gnu/lib/libg++/Makefile b/gnu/lib/libg++/Makefile index 6e3234e..4450023 100644 --- a/gnu/lib/libg++/Makefile +++ b/gnu/lib/libg++/Makefile @@ -1,5 +1,5 @@ # -# $Id$ +# $Id: Makefile,v 1.18 1997/02/22 15:42:54 peter Exp $ # GPPDIR= ${.CURDIR}/../../../contrib/libg++ @@ -11,7 +11,6 @@ SUBDIR+= doc LIB= g++ SHLIB_MAJOR= 4 SHLIB_MINOR= 0 -CPLUSPLUSLIB= 1 # include c++rt0.o for static constructors CFLAGS+= -I${GPPDIR}/include -I/usr/include/g++ CXXFLAGS+= -I${GPPDIR}/include -I${GPPDIR}/libio -I${GPPDIR}/libstdc++ diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile index 0662c33..429c1fd 100644 --- a/gnu/lib/libstdc++/Makefile +++ b/gnu/lib/libstdc++/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.4 1997/02/22 15:43:10 peter Exp $ +# $Id: Makefile,v 1.5 1997/04/09 16:00:07 peter Exp $ # GPPDIR= ${.CURDIR}/../../../contrib/libg++ @@ -10,7 +10,6 @@ GPPDIR= ${.CURDIR}/../../../contrib/libg++ LIB= stdc++ SHLIB_MAJOR= 2 SHLIB_MINOR= 0 -CPLUSPLUSLIB= 1 # include c++rt0.o for static constructors CFLAGS+= -I${GPPDIR}/include -I/usr/include/g++ -I. CXXFLAGS+= -I${GPPDIR}/include -I${GPPDIR}/libio -I${GPPDIR}/libstdc++ diff --git a/lib/libc_r/uthread/Makefile.inc b/lib/libc_r/uthread/Makefile.inc index 3fa6df4..3fbc97b 100644 --- a/lib/libc_r/uthread/Makefile.inc +++ b/lib/libc_r/uthread/Makefile.inc @@ -1,6 +1,4 @@ -# $Id$ - -CPLUSPLUSLIB= cpluspluslib +# $Id: Makefile.inc,v 1.8 1997/02/22 15:05:31 peter Exp $ # uthread sources .PATH: ${.CURDIR}/uthread diff --git a/lib/libkse/thread/Makefile.inc b/lib/libkse/thread/Makefile.inc index 3fa6df4..3fbc97b 100644 --- a/lib/libkse/thread/Makefile.inc +++ b/lib/libkse/thread/Makefile.inc @@ -1,6 +1,4 @@ -# $Id$ - -CPLUSPLUSLIB= cpluspluslib +# $Id: Makefile.inc,v 1.8 1997/02/22 15:05:31 peter Exp $ # uthread sources .PATH: ${.CURDIR}/uthread diff --git a/lib/libpthread/thread/Makefile.inc b/lib/libpthread/thread/Makefile.inc index 3fa6df4..3fbc97b 100644 --- a/lib/libpthread/thread/Makefile.inc +++ b/lib/libpthread/thread/Makefile.inc @@ -1,6 +1,4 @@ -# $Id$ - -CPLUSPLUSLIB= cpluspluslib +# $Id: Makefile.inc,v 1.8 1997/02/22 15:05:31 peter Exp $ # uthread sources .PATH: ${.CURDIR}/uthread |