svn commit: r301468 - head/share/mk
Bryan Drewery
bdrewery at FreeBSD.org
Sun Jun 5 23:05:05 UTC 2016
Author: bdrewery
Date: Sun Jun 5 23:05:04 2016
New Revision: 301468
URL: https://svnweb.freebsd.org/changeset/base/301468
Log:
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
Modified:
head/share/mk/src.opts.mk
Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk Sun Jun 5 23:05:01 2016 (r301467)
+++ head/share/mk/src.opts.mk Sun Jun 5 23:05:04 2016 (r301468)
@@ -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
More information about the svn-src-head
mailing list