diff options
| author | imp <imp@FreeBSD.org> | 2014-07-10 21:11:48 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-07-10 21:11:48 +0000 |
| commit | d284902e1150565feea2878bd56b6a4080a7aad9 (patch) | |
| tree | 46090c7fe45a36451e68f46dba2c391689aa3ec5 | |
| parent | 99b5ccae7ca41a5f7e0999be7e2020ead11b5c37 (diff) | |
| download | FreeBSD-src-d284902e1150565feea2878bd56b6a4080a7aad9.zip FreeBSD-src-d284902e1150565feea2878bd56b6a4080a7aad9.tar.gz | |
Make MK_GNUCXX mean "build the libstdc++ and libsupc++ libraries" and
nothing more. Force it to be "no" when MK_CXX is "no" to simplify
usage. It no longer also means "build g++" since we no longer have a
platform where that's interesting now that pc98 no longer needs clang
and gcc, but not g++. pc98 now just uses clang after boot2 changes.
| -rw-r--r-- | Makefile.inc1 | 2 | ||||
| -rw-r--r-- | gnu/lib/Makefile | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/Makefile | 7 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 5 |
4 files changed, 6 insertions, 10 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 484cafb..5c16f71 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1494,7 +1494,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_lib_libldns} \ ${_secure_lib_libssh} ${_secure_lib_libssl} -.if ${MK_GNUCXX} != "no" && ${MK_CXX} != "no" +.if ${MK_GNUCXX} != "no" _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++ gnu/lib/libstdc++__L: lib/msun__L .endif diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 2651eef..373c280 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -14,7 +14,7 @@ SUBDIR+= tests # libsupc++ uses libstdc++ headers, although 'make includes' should # have taken care of that already. -.if ${MK_GNUCXX} != "no" && ${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 313aaf2..8191ea4 100644 --- a/gnu/usr.bin/cc/Makefile +++ b/gnu/usr.bin/cc/Makefile @@ -12,12 +12,7 @@ SUBDIR+= cpp .endif .if ${MK_CXX} != "no" -.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 +SUBDIR+= cc1plus c++ c++filt .endif .if ${MK_GCOV} != "no" diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index f740116..d9d3fef 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -205,11 +205,11 @@ __DEFAULT_NO_OPTIONS+=CLANG CLANG_FULL CLANG_BOOTSTRAP .if ${__T} == "amd64" || ${__T} == "arm" || ${__T} == "armv6" || \ ${__T} == "armv6hf" || ${__T} == "i386" __DEFAULT_YES_OPTIONS+=CLANG_IS_CC -__DEFAULT_NO_OPTIONS+=GNUCXX GCC GCC_BOOTSTRAP +__DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX .else # If clang is not cc, then build gcc by default __DEFAULT_NO_OPTIONS+=CLANG_IS_CC CLANG CLANG_BOOTSTRAP -__DEFAULT_YES_OPTIONS+=GCC GNUCXX GCC_BOOTSTRAP +__DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX .endif .include <bsd.mkopt.mk> @@ -269,6 +269,7 @@ MK_KERBEROS:= no .if ${MK_CXX} == "no" MK_CLANG:= no MK_GROFF:= no +MK_GNUCXX:= no .endif .if ${MK_MAIL} == "no" |
