From 83f56d9ae49bc674154b5688dca21dc40194bb94 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Wed, 15 May 2002 16:29:45 +0000 Subject: Make sure to not yet build the GNU C++, but still allow for the C++ progs to be built with e.g. an old compiler, CXX=/usr/bin/c++, for the time being. --- gnu/lib/Makefile | 6 ++---- gnu/usr.bin/Makefile | 2 +- gnu/usr.bin/cc/Makefile | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 971934f9983e..79f73dd1ef0d 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 c0bd0f24ebea..83018bf1b62f 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 cd7b47f43754..c1565e6cc605 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 -- cgit v1.3