summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authortheraven <theraven@FreeBSD.org>2013-09-06 20:08:03 +0000
committertheraven <theraven@FreeBSD.org>2013-09-06 20:08:03 +0000
commit1df952388b48e11694d9be00cbdb7fed2ca1c0f3 (patch)
tree323fdbecd93a672260c605a70c974da7b41353c6 /gnu
parent6965cdad6639b93d4b619f8e095c037377cd0d66 (diff)
downloadFreeBSD-src-1df952388b48e11694d9be00cbdb7fed2ca1c0f3.zip
FreeBSD-src-1df952388b48e11694d9be00cbdb7fed2ca1c0f3.tar.gz
On platforms where clang is the default compiler, don't build gcc or libstdc++.
To enable them, set WITH_GCC and WITH_GNUCXX in src.conf. Make clang default to using libc++ on FreeBSD 10. Bumped __FreeBSD_version for the change. GCC is still enabled on PC98, because the PC98 bootloader requires GCC to build (or, at least, hard-codes the use of gcc into its build). Thanks to everyone who helped make the ports tree ready for this (and bapt for coordinating them all). Also to imp for reviewing this and working on the forward-porting of the changes in our gcc so that we're getting to a much better place with regard to external toolchains. Sorry to all of the people who helped who I forgot to mention by name. Reviewed by: bapt, imp, dim, ...
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 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"
OpenPOWER on IntegriCloud