diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2002-05-15 16:29:45 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2002-05-15 16:29:45 +0000 |
| commit | 83f56d9ae49bc674154b5688dca21dc40194bb94 (patch) | |
| tree | f025d67a22654d8ff2203628f971ff7d615e4142 | |
| parent | 5d86203733738382e4207e3e9758e36f446d09a0 (diff) | |
Notes
| -rw-r--r-- | Makefile.inc1 | 4 | ||||
| -rw-r--r-- | gnu/lib/Makefile | 6 | ||||
| -rw-r--r-- | gnu/usr.bin/Makefile | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/Makefile | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 2ec25d0d8b82a..53c757b5d83c8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -659,10 +659,6 @@ cross-tools: hierarchy: cd ${.CURDIR}/etc; ${MAKE} distrib-dirs -.if ${CXX} == "c++" -NO_CXX= yes -.endif - # # libraries - build all libraries, and install them under ${DESTDIR}. # diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 971934f9983e1..79f73dd1ef0db 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -8,13 +8,11 @@ SUBDIR+= libgcc_r .endif .endif -.if ${CXX:T} == "c++" -NO_CXX= yes -.endif - +.if notyet .if !defined(NO_CXX) SUBDIR+= libsupc++ libstdc++ .endif +.endif .if !defined(NO_OBJC) SUBDIR+= libobjc diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index c0bd0f24ebea1..83018bf1b62f2 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -3,7 +3,7 @@ SUBDIR= awk bc binutils cc cpio dc dialog diff diff3 \ grep gzip man patch ptx rcs sdiff send-pr sort tar texinfo -.if ${CXX:T} != "c++" +.if ${CXX} != "c++" SUBDIR+=gperf groff .endif diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile index cd7b47f437545..c1565e6cc6052 100644 --- a/gnu/usr.bin/cc/Makefile +++ b/gnu/usr.bin/cc/Makefile @@ -9,12 +9,14 @@ SUBDIR= cc_fbsd cc_tools cc_int cc cc1 cpp0 protoize tradcpp0 SUBDIR+= cpp .endif +.if notyet .if !defined(NO_CXX) SUBDIR+= cc1plus c++ c++filt doc .if !defined(NO_COLLECT2) #SUBDIR+= collect2 .endif .endif +.endif .if !defined(NO_OBJC) SUBDIR+= cc1obj |