diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-11-05 00:11:51 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-11-05 00:11:51 +0000 |
| commit | 996e4759621dd7150cec5ad240e252b35a4d9db4 (patch) | |
| tree | 5a6481cbaf2a6cd84ad2dbf50eaac198467401d3 /Makefile.inc1 | |
| parent | 1031b94fc4e0310b49781e0936de6486b5f836b8 (diff) | |
| download | src-test2-996e4759621dd7150cec5ad240e252b35a4d9db4.tar.gz src-test2-996e4759621dd7150cec5ad240e252b35a4d9db4.zip | |
Fix nested MAKEOBJDIRPREFIX breaking various release/buildworld/toolchain targets.
This problem was caused by r325329 and r325350.
For the release(7) targets, some will run mm-mtree.sh which itself runs make
with a MAKEOBJDIRPREFIX. The execution of that script leaks OBJROOT,
MAKEOBJDIR, and MAKELEVEL=1 in the environment. This causes the mm-mtree makes
to not do some basic setup of OBJROOT and only use this special
MAKEOBJDIRPREFIX case which fails to empty out MAKEOBJDIRPREFIX for further
nested makes, such as a tree walk. If that tree walk sets OBJROOT/OBJTOP such
as r325329 is doing, then the wrong OBJDIRs end up being used due to the
unemptied MAKEOBJDIRPREFIX being preferred over the proper MAKEOBJDIR.
Pointyhat to: bdrewery
Sponsored by: Dell EMC Isilon
Notes
Notes:
svn path=/head/; revision=325412
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 0ee35a41d71b..e306f7dd0615 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -523,6 +523,7 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ BSARGS= DESTDIR= \ OBJTOP='${WORLDTMP}/obj-tools' \ OBJROOT='$${OBJTOP}/' \ + MAKEOBJDIRPREFIX= \ BOOTSTRAPPING=${OSRELDATE} \ BWPHASE=${.TARGET:C,^_,,} \ SSP_CFLAGS= \ @@ -565,6 +566,7 @@ KTMAKE= TOOLS_PREFIX=${WORLDTMP} \ DESTDIR= \ OBJTOP='${WORLDTMP}/obj-kernel-tools' \ OBJROOT='$${OBJTOP}/' \ + MAKEOBJDIRPREFIX= \ BOOTSTRAPPING=${OSRELDATE} \ SSP_CFLAGS= \ MK_HTML=no -DNO_LINT MK_MAN=no \ |