From d5b29b60f837f46b0a545df41f764d109933d84c Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 13 Apr 2017 19:27:46 +0000
Subject: [PATCH] Pass COMPILER_FEATURES down to submakes for installworld.
This is for WITH_SYSTEM_COMPILER, WITHOUT_CROSS_COMPILER, external
compiler, etc.
MFC after: 2 weeks
Sponsored by: Dell EMC Isilon
---
Makefile.inc1 | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index 56a73dad0653..55e391d3fe64 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -135,7 +135,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}}"
@@ -153,9 +154,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