diff options
| author | sjg <sjg@FreeBSD.org> | 2013-09-11 18:16:18 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-09-11 18:16:18 +0000 |
| commit | ff87b5d1477fd150ff715e5c3c2a205deb66804f (patch) | |
| tree | a3620d99f472deaa7f019c4324bb8f4e38ac4272 /gnu | |
| parent | 62bb1062226d3ce6a2350808256a25508978352d (diff) | |
| parent | 4d92de31b23f33109e1fa7f0b1499ed6c3501ee1 (diff) | |
| download | FreeBSD-src-ff87b5d1477fd150ff715e5c3c2a205deb66804f.zip FreeBSD-src-ff87b5d1477fd150ff715e5c3c2a205deb66804f.tar.gz | |
Merge head
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/Makefile | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/Makefile | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 6750403..50797fc 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 efb548a..bf6d20c 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" |
