From 9c8b82a95f54a67a3acebde201d8a4918c69bee8 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Sun, 5 Jun 2016 23:05:04 +0000 Subject: [PATCH] WITH_SYSTEM_COMPILER: Disable with WITH_META_MODE for now. The WITH_META_MODE build is intended to be a working incremental build. It spies on the build command to see if things should be rebuilt if the command changes. If you run buildworld, it builds a cross-compiler, then do installworld and buildworld again it will invoke the WITH_SYSTEM_COMPILER logic. This then adds on -target/--sysroot, etc, and causes rebuilds due to the changed build command even though the compiler used is technically the same revision. Since the incremental build is not cleaning anything by default then there is much less risk to rebuilding the already-existing cross-compiler. Just disable the combined logic and always use and build the cross-compiler. An alternative to this would be to always pass -target/--sysroot. Doing so may occur in the future. Sponsored by: EMC / Isilon Storage Division --- share/mk/src.opts.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 30fe1180e37..e3ef419cb4f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -352,6 +352,10 @@ MK_ELFTOOLCHAIN_BOOTSTRAP:= no MK_GCC_BOOTSTRAP:= no .endif +.if ${MK_META_MODE} == "yes" +MK_SYSTEM_COMPILER:= no +.endif + .if ${MK_TOOLCHAIN} == "no" MK_BINUTILS:= no MK_CLANG:= no