unbreak world, take 2
authorJohn Marino <draco@marino.st>
Mon, 16 Feb 2015 14:38:24 +0000 (15:38 +0100)
committerJohn Marino <draco@marino.st>
Mon, 16 Feb 2015 14:38:24 +0000 (15:38 +0100)
The previous style works in the world makefiles but not here.
Try to fix the unbreak by checking if .MAKE.BUILT.BY is defined before
attempting to use it.

share/mk/sys.mk

index 011fadb..3996879 100644 (file)
@@ -60,10 +60,8 @@ 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)
-. if ${.MAKE.BUILT.BY:Mgcc47}
+.if !defined(SYSBUILD) && defined(.MAKE.BUILT.BY) && ${.MAKE.BUILT.BY:Mgcc47}
 CXXFLAGS       +=      -D_GLIBCXX_USE_CXX11_ABI=0
-. endif
 .endif
 
 CPP            ?=      cpp