diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2018-06-28 18:19:46 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2018-06-28 18:19:46 +0000 |
| commit | 32cec12c7573e03e79b877af65aee197818b5d02 (patch) | |
| tree | c49ea98cf43e58c181e3e0da77ee5646f996d9a6 /Makefile | |
| parent | e02d32f72edf209719d83c85bc742f5b58166e0e (diff) | |
| download | src-test-32cec12c7573e03e79b877af65aee197818b5d02.tar.gz src-test-32cec12c7573e03e79b877af65aee197818b5d02.zip | |
Include existing MAKE_PARAMS_<target> when determining the universe toolchain.
This fixes a warning for each RISCV target during universe by passing in
the required CROSS_TOOLCHAIN setting which will in turn set
CROSS_BINUTILS_PREFIX correctly. It also ensures that a tinderbox build
uses the correct compiler for riscv. Previously it was using the shared
clang compiler instead of riscv64-gcc.
Reviewed by: bdrewery
Sponsored by: DARPA / AFRL
Differential Revision: https://reviews.freebsd.org/D16049
Notes
Notes:
svn path=/head/; revision=335769
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile index d626061f249bc..0e2f94e0cda32 100644 --- a/Makefile +++ b/Makefile @@ -587,14 +587,14 @@ universe_${target}_worlds: .PHONY _need_clang_${target}_${target_arch} != \ env TARGET=${target} TARGET_ARCH=${target_arch} \ ${SUB_MAKE} -C ${.CURDIR} -f Makefile.inc1 test-system-compiler \ - -V MK_CLANG_BOOTSTRAP + ${MAKE_PARAMS_${target}} -V MK_CLANG_BOOTSTRAP .export _need_clang_${target}_${target_arch} .endif .if !defined(_need_lld_${target}_${target_arch}) _need_lld_${target}_${target_arch} != \ env TARGET=${target} TARGET_ARCH=${target_arch} \ ${SUB_MAKE} -C ${.CURDIR} -f Makefile.inc1 test-system-linker \ - -V MK_LLD_BOOTSTRAP + ${MAKE_PARAMS_${target}} -V MK_LLD_BOOTSTRAP .export _need_lld_${target}_${target_arch} .endif # Setup env for each arch to use the one clang. |