diff options
author | Warner Losh <imp@FreeBSD.org> | 2014-04-01 14:24:15 +0000 |
---|---|---|
committer | Warner Losh <imp@FreeBSD.org> | 2014-04-01 14:24:15 +0000 |
commit | fffba3dbc239061e8fdf280f88ac17d2df09a3c0 (patch) | |
tree | 581283129ea9cbdf0a3642f85d15650bdb9e4f3f | |
parent | e5c1052e48da0175b996bcbd73156129fa689f04 (diff) | |
download | src-fffba3dbc239061e8fdf280f88ac17d2df09a3c0.tar.gz src-fffba3dbc239061e8fdf280f88ac17d2df09a3c0.zip |
There's no need to set the default for GNUCXX based on WITHOUT_CXX
being defined. The system works fine without it (because GNUCXX isn't
built when WITHOUT_CXX is defined), and it is one of the few places we
test WITHOUT_FOO instead of MK_FOO in the base system. Simply
eliminate it to solve both problems. Also, minor tweak to make it
clearer that the default is always NO for GNUGCC on i386.
Notes
Notes:
svn path=/head/; revision=263994
-rw-r--r-- | share/mk/bsd.own.mk | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 699f6777f543..24a0fcd53734 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -408,24 +408,18 @@ __DEFAULT_NO_OPTIONS+=CLANG CLANG_FULL .if ${__T} == "amd64" || ${__T} == "arm" || ${__T} == "armv6" || \ ${__T} == "armv6hf" || ${__T} == "i386" __DEFAULT_YES_OPTIONS+=CLANG_IS_CC +__DEFAULT_NO_OPTIONS+=GNUCXX # The pc98 bootloader requires gcc to build and so we must leave gcc enabled # for pc98 for now. .if ${__TT} == "pc98" -__DEFAULT_NO_OPTIONS+=GNUCXX __DEFAULT_YES_OPTIONS+=GCC .else -__DEFAULT_NO_OPTIONS+=GCC GNUCXX +__DEFAULT_NO_OPTIONS+=GCC .endif .else # If clang is not cc, then build gcc by default __DEFAULT_NO_OPTIONS+=CLANG_IS_CC -__DEFAULT_YES_OPTIONS+=GCC -# And if g++ is c++, build the rest of the GNU C++ stack -.if defined(WITHOUT_CXX) -__DEFAULT_NO_OPTIONS+=GNUCXX -.else -__DEFAULT_YES_OPTIONS+=GNUCXX -.endif +__DEFAULT_YES_OPTIONS+=GCC GNUCXX .endif # |