diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-06-04 17:17:10 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-06-04 17:17:10 +0000 |
| commit | 275fddd04c7a834c0e046ff0aa4acf7b981e52e1 (patch) | |
| tree | 9af1f031b3eaf7034f1ab4b463f368415ca98483 /Makefile.inc1 | |
| parent | 3169b6e8ad6fc05ecc1d568b5973bdf24d113527 (diff) | |
| download | FreeBSD-src-275fddd04c7a834c0e046ff0aa4acf7b981e52e1.zip FreeBSD-src-275fddd04c7a834c0e046ff0aa4acf7b981e52e1.tar.gz | |
Follow-up r301287: Pass external compiler metadata when used.
This fixes WITH_SYSTEM_COMPILER, WITHOUT_CROSS_COMPILER, external compiler, to
pass the external compiler metadata rather than the ${CC} metadata. On
a build host that has clang as CC it was passing the clang metadata rather than
GCC metadata during the build.
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 448c768..ef1c647 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -129,9 +129,15 @@ MK_GCC_BOOTSTRAP= no # 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_FREEBSD_VERSION=${COMPILER_FREEBSD_VERSION} +.else +CROSSENV+= COMPILER_VERSION=${X_COMPILER_VERSION} \ + COMPILER_TYPE=${X_COMPILER_TYPE} \ + COMPILER_FREEBSD_VERSION=${X_COMPILER_FREEBSD_VERSION} +.endif .endif # Handle external binutils. |
