summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorDavid Chisnall <theraven@FreeBSD.org>2013-09-06 20:08:03 +0000
committerDavid Chisnall <theraven@FreeBSD.org>2013-09-06 20:08:03 +0000
commit52b42bace1338f8146d7dd5d1a7f6e41d5f5f80d (patch)
tree323fdbecd93a672260c605a70c974da7b41353c6 /gnu
parent7acd42244e125252c3dc01f6424be9350a5f1216 (diff)
Notes
Diffstat (limited to 'gnu')
-rw-r--r--gnu/lib/Makefile2
-rw-r--r--gnu/usr.bin/cc/Makefile7
2 files changed, 7 insertions, 2 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 6750403d66c5..50797fced309 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -10,7 +10,7 @@ SUBDIR+= libssp
# libsupc++ uses libstdc++ headers, although 'make includes' should
# have taken care of that already.
-.if ${MK_CXX} != "no"
+.if ${MK_GNUCXX} != "no"
SUBDIR+= libstdc++ libsupc++
.endif
diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index efb548aaf62e..bf6d20c79ce4 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -12,7 +12,12 @@ SUBDIR+= cpp
.endif
.if ${MK_CXX} != "no"
-SUBDIR+= cc1plus c++ c++filt
+.if ${MK_GNUCXX} != "no"
+SUBDIR+= cc1plus c++
+.endif
+# This should be moved into the above block once c++filt from elftoolchain or
+# similar is provided.
+SUBDIR+= c++filt
.endif
.if ${MK_GCOV} != "no"