Date: Tue, 1 Apr 2014 14:24:16 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r263994 - head/share/mk Message-ID: <201404011424.s31EOGRo015006@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Apr 1 14:24:15 2014 New Revision: 263994 URL: http://svnweb.freebsd.org/changeset/base/263994 Log: 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. Modified: head/share/mk/bsd.own.mk Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Tue Apr 1 14:24:08 2014 (r263993) +++ head/share/mk/bsd.own.mk Tue Apr 1 14:24:15 2014 (r263994) @@ -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 #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404011424.s31EOGRo015006>