From f9931f0499c3e12bab6e371d21decb89d9e4df18 Mon Sep 17 00:00:00 2001 From: John Marino Date: Mon, 16 Feb 2015 15:38:24 +0100 Subject: [PATCH] unbreak world, take 2 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 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 011fadb642..39968792e7 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -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 -- 2.41.0