diff options
author | Bryan Drewery <bdrewery@FreeBSD.org> | 2018-06-19 23:39:55 +0000 |
---|---|---|
committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2018-06-19 23:39:55 +0000 |
commit | aafc33396ea9fe146acab1ca0dd353a52943e601 (patch) | |
tree | 861c1a7fd1f1c493dffc307f0b08f7bb3100aaba | |
parent | 3edda95c9d583f5df4db2ca21bb2a92a885a1748 (diff) | |
download | src-test2-aafc33396ea9fe146acab1ca0dd353a52943e601.tar.gz src-test2-aafc33396ea9fe146acab1ca0dd353a52943e601.zip |
Notes
-rw-r--r-- | Makefile.inc1 | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index caa44e5d3ebe..8c45b26b4492 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -169,22 +169,6 @@ test-system-compiler: .PHONY .info SYSTEM_COMPILER: Determined that CC=${CC} matches the source tree. Not bootstrapping a cross-compiler. .endif -# For installworld need to ensure that the looked-up compiler metadata is -# passed along rather than trying to run cc from the restricted -# STRICTTMPPATH. -.if ${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no" -.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 -.endif # Store some compiler metadata for use in installworld where we don't # want to invoke CC at all. _COMPILER_METADATA_VARS= COMPILER_VERSION \ @@ -201,8 +185,10 @@ compiler-metadata.mk: .PHONY .META @echo "_LOADED_COMPILER_METADATA=t" >> ${.TARGET} .for v in ${_COMPILER_METADATA_VARS} @echo "${v}=${${v}}" >> ${.TARGET} + @echo "X_${v}=${X_${v}}" >> ${.TARGET} .endfor @echo ".export ${_COMPILER_METADATA_VARS}" >> ${.TARGET} + @echo ".export ${_COMPILER_METADATA_VARS:C,^,X_,}" >> ${.TARGET} # Handle external binutils. .if defined(CROSS_TOOLCHAIN_PREFIX) |