From: John Marino <draco@marino.st>
Date: Mon, 16 Feb 2015 14:32:03 +0000 (+0100)
Subject: unbreak world
X-Git-Tag: v4.2.0rc~806
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/2a66d7e272714700a8fcd4850a837f3c4ab9552d

unbreak world

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.
---

diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 0025fdefc6..011fadb642 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -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