svn commit: r335392 - head

Bryan Drewery bdrewery at FreeBSD.org
Tue Jun 19 23:40:37 UTC 2018


Author: bdrewery
Date: Tue Jun 19 23:40:36 2018
New Revision: 335392
URL: https://svnweb.freebsd.org/changeset/base/335392

Log:
  SYSTEM_COMPILER: Should use X_ vars for comparing wanted version.
  
  It is XCC used during the build of target binaries that replaces the
  bootstrap compiler.
  
  Also slightly tweak style.
  
  MFC after:	2 weeks
  Sponsored by:	Dell EMC

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Jun 19 23:39:55 2018	(r335391)
+++ head/Makefile.inc1	Tue Jun 19 23:40:36 2018	(r335392)
@@ -138,10 +138,10 @@ WANT_COMPILER_VERSION!= \
 .if ${MK_SYSTEM_COMPILER} == "yes" && \
     (${MK_CLANG_BOOTSTRAP} == "yes" || ${MK_GCC_BOOTSTRAP} == "yes") && \
     !make(showconfig) && !make(xdev*) && \
-    ${WANT_COMPILER_TYPE} == ${COMPILER_TYPE} && \
-    (${COMPILER_TYPE} == "clang" || ${TARGET_ARCH} == ${MACHINE_ARCH}) && \
-    ${COMPILER_VERSION} == ${WANT_COMPILER_VERSION} && \
-    ${COMPILER_FREEBSD_VERSION} == ${WANT_COMPILER_FREEBSD_VERSION}
+    ${X_COMPILER_TYPE} == ${WANT_COMPILER_TYPE} && \
+    (${X_COMPILER_TYPE} == "clang" || ${TARGET_ARCH} == ${MACHINE_ARCH}) && \
+    ${X_COMPILER_VERSION} == ${WANT_COMPILER_VERSION} && \
+    ${X_COMPILER_FREEBSD_VERSION} == ${WANT_COMPILER_FREEBSD_VERSION}
 # Everything matches, disable the bootstrap compiler.
 MK_CLANG_BOOTSTRAP=	no
 MK_GCC_BOOTSTRAP=	no


More information about the svn-src-head mailing list