From 1db83e6350358e634948ce1668fefe3982cb5aeb Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Wed, 25 Nov 2015 19:10:53 +0000 Subject: [PATCH] META MODE: Don't override DESTDIR to the default when building the toolchain. For this case, the normal META MODE staging logic should be used. The BSARGS having DESTDIR= is due to Makefile.inc1 overriding DESTDIR to something when appropriate. For the toolchain stage META MODE is in charge of it, not Makefile.inc1. At least include/, if staging it to the host stagedir, was impacted from this. Staging of include.host is not yet done. Sponsored by: EMC / Isilon Storage Division --- targets/pseudo/bootstrap-tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile index a9cdfe5ee9d..75c08d89bde 100644 --- a/targets/pseudo/bootstrap-tools/Makefile +++ b/targets/pseudo/bootstrap-tools/Makefile @@ -78,4 +78,4 @@ BSTCARGS= \ # finally we build toolchain leveraging the above. bootstrap-toolchain: .MAKE cross-tools - ${BSTCENV} ${MAKE} -C ${.CURDIR:H:H} ${BSTCARGS} toolchain + ${BSTCENV} ${MAKE} -C ${.CURDIR:H:H} ${BSTCARGS:NDESTDIR=} toolchain