diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-06-19 18:08:20 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-06-19 18:08:20 +0000 |
| commit | 35fb812adfc212234df4c132e1d6bbbb3b168a74 (patch) | |
| tree | 112a043ac3a643a3a4ed9a1d44e23629b874f378 /Makefile.inc1 | |
| parent | ad706c65e191fbfe475749ea410bddd6e9a0fa5d (diff) | |
| download | src-test2-35fb812adfc212234df4c132e1d6bbbb3b168a74.tar.gz src-test2-35fb812adfc212234df4c132e1d6bbbb3b168a74.zip | |
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
Notes
Notes:
svn path=/head/; revision=320119
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 2b8f46b3679a..242e76b24e18 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -563,7 +563,8 @@ KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \ # 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} # |