svn commit: r317564 - stable/11

[Bryan Drewery]

Author: bdrewery
Date: Fri Apr 28 17:56:09 2017
New Revision: 317564
URL: https://svnweb.freebsd.org/changeset/base/317564

Log:
  MFC r316780:
  
    Pass COMPILER_FEATURES down to submakes for installworld.

Modified:
  stable/11/Makefile.inc1
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/Makefile.inc1
==============================================================================
--- stable/11/Makefile.inc1	Fri Apr 28 17:55:27 2017	(r317563)
+++ stable/11/Makefile.inc1	Fri Apr 28 17:56:09 2017	(r317564)
@@ -133,7 +133,8 @@ TEST_SYSTEM_COMPILER_VARS= \
 	MK_CROSS_COMPILER MK_CLANG_BOOTSTRAP MK_GCC_BOOTSTRAP \
 	WANT_COMPILER_TYPE WANT_COMPILER_VERSION WANT_COMPILER_VERSION_FILE \
 	WANT_COMPILER_FREEBSD_VERSION WANT_COMPILER_FREEBSD_VERSION_FILE \
-	CC COMPILER_TYPE COMPILER_VERSION COMPILER_FREEBSD_VERSION
+	CC COMPILER_TYPE COMPILER_FEATURES COMPILER_VERSION \
+	COMPILER_FREEBSD_VERSION
 test-system-compiler: .PHONY
 .for v in ${TEST_SYSTEM_COMPILER_VARS}
 	${_+_}@printf "%-35s= %s\n" "${v}" "${${v}}"
@@ -151,9 +152,11 @@ test-system-compiler: .PHONY
 .if !defined(X_COMPILER_TYPE)
 CROSSENV+=	COMPILER_VERSION=${COMPILER_VERSION} \
 		COMPILER_TYPE=${COMPILER_TYPE} \
+		COMPILER_FEATURES=${COMPILER_FEATURES} \
 		COMPILER_FREEBSD_VERSION=${COMPILER_FREEBSD_VERSION}
 .else
 CROSSENV+=	COMPILER_VERSION=${X_COMPILER_VERSION} \
+		COMPILER_FEATURES=${X_COMPILER_FEATURES} \
 		COMPILER_TYPE=${X_COMPILER_TYPE} \
 		COMPILER_FREEBSD_VERSION=${X_COMPILER_FREEBSD_VERSION}
 .endif