Author: bdrewery
Date: Mon Jun 19 18:08:20 2017
New Revision: 320119
URL: https://svnweb.freebsd.org/changeset/base/320119
Log:
buildworld: Define SYSROOT to WORLDTMP.
This is to allow downstream Makefiles to know for sure they are building
against a sysroot rather than only depending on ${DESTDIR} or other
assumptions.
This also exports it into buildenv.
MFC after: 2 weeks
Sponsored by: Dell EMC Isilon
Modified:
head/Makefile.inc1
head/Makefile.libcompat
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Mon Jun 19 18:08:02 2017 (r320118)
+++ head/Makefile.inc1 Mon Jun 19 18:08:20 2017 (r320119)
@@ -563,7 +563,8 @@ KTMAKE= TOOLS_PREFIX=${WORLDTMP}
MAKEOBJDIRPREFIX=${W
# world stage
WMAKEENV= ${CROSSENV} \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
- PATH=${TMPPATH}
+ PATH=${TMPPATH} \
+ SYSROOT=${WORLDTMP}
# make hierarchy
HMAKE= PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE:Q}
@@ -722,7 +723,7 @@ IMAKE_MTREE= MTREE_CMD="mtree ${MTREEFLAGS}"
.endif
# kernel stage
-KMAKEENV= ${WMAKEENV}
+KMAKEENV= ${WMAKEENV:NSYSROOT=*}
KMAKE= ${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLAGS}
KERNEL=${INSTKERNNAME}
#
Modified: head/Makefile.libcompat
==============================================================================
--- head/Makefile.libcompat Mon Jun 19 18:08:02 2017 (r320118)
+++ head/Makefile.libcompat Mon Jun 19 18:08:20 2017 (r320119)
@@ -111,6 +111,7 @@ LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/inclu
LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH} \
+ SYSROOT=${LIBCOMPATTMP} \
LIBDIR=/usr/lib${libcompat} \
SHLIBDIR=/usr/lib${libcompat} \
DTRACE="${LIB$COMPATDTRACE:U${DTRACE}}"
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
