From 76506db45de5128ae22c941ebd030e98c023690d Mon Sep 17 00:00:00 2001
From: sjg <sjg@FreeBSD.org>
Date: Fri, 19 Apr 2013 18:45:03 +0000
Subject: Add stage-install.sh so we can do away with the need to have
 $STAGE_OBJTOP/include for src/include.

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

(limited to 'share/mk/local.sys.mk')

diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk
index aea9a75..5d5c2c8 100644
--- a/share/mk/local.sys.mk
+++ b/share/mk/local.sys.mk
@@ -156,7 +156,7 @@ STAGE_SYMLINKS_DIR= ${STAGE_OBJTOP}
 .if ${MACHINE} != "host"
 CFLAGS_LAST+= -nostdinc
 .endif
-CFLAGS_LAST+= -isystem ${STAGE_OBJTOP}/usr/include -isystem ${STAGE_OBJTOP}/include
+CFLAGS_LAST+= -isystem ${STAGE_OBJTOP}/usr/include 
 CFLAGS_LAST += ${CFLAGS_LAST.${COMPILER_TYPE}}
 LDFLAGS_LAST+= -B${STAGE_LIBDIR} -L${STAGE_LIBDIR}
 CXXFLAGS_LAST += -isystem ${STAGE_OBJTOP}/usr/include/c++/${GCCVER:U4.2}
@@ -166,10 +166,10 @@ CFLAGS_LAST.clang += -isystem ${STAGE_OBJTOP}/usr/include/clang/3.2
 CXXFLAGS_LAST += ${CFLAGS_LAST.${COMPILER_TYPE}}
 .else
 # if ld suppored sysroot, this would suffice
-CFLAGS_LAST+= --sysroot=${STAGE_OBJTOP} -isystem ${STAGE_OBJTOP}/include
+CFLAGS_LAST+= --sysroot=${STAGE_OBJTOP}
 .endif
 .endif
-STAGED_INCLUDE_DIR= ${STAGE_OBJTOP}/include
+STAGED_INCLUDE_DIR= ${STAGE_OBJTOP}/usr/include
 .if ${USE_META:Uyes} == "yes"
 .include "meta.sys.mk"
 .endif
-- 
cgit v1.1