unbreak world
authorJohn Marino <draco@marino.st>
Mon, 16 Feb 2015 14:32:03 +0000 (15:32 +0100)
committerJohn Marino <draco@marino.st>
Mon, 16 Feb 2015 14:32:03 +0000 (15:32 +0100)
Upgrading from a world with the older bmake that didn't know
.MAKE.BUILT.BY results in a broken world, immediately.  Change the check
from "&&" to two separate checks to avoid the malformed condition.

share/mk/sys.mk

index 0025fde..011fadb 100644 (file)
@@ -60,8 +60,10 @@ CXX_LINK     ?=      ${CXX}
 NXCXX          ?=      ${NXENV} ${CXX}
 NXCXX_LINK     ?=      ${NXENV} ${CXX_LINK}
 CXXFLAGS       ?=      ${CXXINCLUDES} ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign:N-Wold-style-definition}
-.if !defined(SYSBUILD) && ${.MAKE.BUILT.BY:Mgcc47}
+.if !defined(SYSBUILD)
+. if ${.MAKE.BUILT.BY:Mgcc47}
 CXXFLAGS       +=      -D_GLIBCXX_USE_CXX11_ABI=0
+. endif
 .endif
 
 CPP            ?=      cpp