diff options
author | sjg <sjg@FreeBSD.org> | 2013-04-19 18:45:03 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2013-04-19 18:45:03 +0000 |
commit | 76506db45de5128ae22c941ebd030e98c023690d (patch) | |
tree | d9544fd3861e9ee52ea48469d4454f4156ad1159 /share/mk/local.sys.mk | |
parent | fc5871dce75eba44c86055567c300d53f8ea0e5a (diff) | |
download | FreeBSD-src-76506db45de5128ae22c941ebd030e98c023690d.zip FreeBSD-src-76506db45de5128ae22c941ebd030e98c023690d.tar.gz |
Add stage-install.sh so we can do away with the need to have
$STAGE_OBJTOP/include for src/include.
Diffstat (limited to 'share/mk/local.sys.mk')
-rw-r--r-- | share/mk/local.sys.mk | 6 |
1 files changed, 3 insertions, 3 deletions
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 |