From 1e5c3c2b291204d01545abe5e443363430399a6f Mon Sep 17 00:00:00 2001
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Thu, 8 Nov 2012 21:38:26 +0000
Subject: [PATCH] Need CXXFLAGS_LAST and LDFLAGS_LAST

---
 share/mk/local.sys.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk
index 8b8f08550ba..d8c4898400a 100644
--- a/share/mk/local.sys.mk
+++ b/share/mk/local.sys.mk
@@ -140,16 +140,18 @@ STAGE_INCSDIR= ${STAGE_OBJTOP}${INCSDIR:U/include}
 CFLAGS_LAST+= -nostdinc
 .endif
 CFLAGS_LAST+= -isystem ${STAGE_OBJTOP}/usr/include -isystem ${STAGE_OBJTOP}/include
-LDFLAGS+= -B${STAGE_LIBDIR} -L${STAGE_LIBDIR}
+LDFLAGS_LAST+= -B${STAGE_LIBDIR} -L${STAGE_LIBDIR}
+CXXFLAGS_LAST+= -isystem ${STAGE_OBJTOP}/usr/include/c++/${GCCVER:U4.2}
 .else
 # if ld suppored sysroot, this would suffice
 CFLAGS_LAST+= --sysroot=${STAGE_OBJTOP} -isystem ${STAGE_OBJTOP}/include
 .endif
 .endif
-
+.if ${USE_META:Uyes} == "yes"
 .include "meta.sys.mk"
+.endif
 
-# most dirs can be satisfied with one Makefile.depend ?
+# most dirs can be satisfied with one Makefile.depend
 .undef .MAKE.DEPENDFILE
 .MAKE.DEPENDFILE_PREFERENCE = \
 	${.MAKE.DEPENDFILE_PREFIX} \