svn commit: r340167 - head

[Alex Richardson]

Author: arichardson
Date: Mon Nov  5 22:51:44 2018
New Revision: 340167
URL: https://svnweb.freebsd.org/changeset/base/340167

Log:
  Keep inheriting $PATH when using system linker/compiler
  
  I missed this case when testing r340157. For now just keep
  $PATH when we aren't bootstrapping a compiler so that the build
  can find cc/c++/ld without an absolute path.
  
  Reported by:	yuripv

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Mon Nov  5 22:36:45 2018	(r340166)
+++ head/Makefile.inc1	Mon Nov  5 22:51:44 2018	(r340167)
@@ -589,7 +589,12 @@ STRICTTMPPATH=	${XPATH}:${BPATH}:${UNIVERSE_TOOLCHAIN_
 # the build to break on other systems that don't have that tool. For now we
 # still allow using the old behaviour (inheriting $PATH) if
 # BUILD_WITH_STRICT_TMPPATH is set to 0 but this will eventually be removed.
+.if ${USING_SYSTEM_LINKER} != "no" || ${USING_SYSTEM_COMPILER} != "no"
+# strict $PATH does not work yet with USING_SYSTEM_LINKER/USING_SYSTEM_COMPILER
+BUILD_WITH_STRICT_TMPPATH?=0
+.else
 BUILD_WITH_STRICT_TMPPATH?=1
+.endif
 .if ${BUILD_WITH_STRICT_TMPPATH} != 0
 TMPPATH=	${STRICTTMPPATH}
 .else