d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include existing MAKE_PARAMS_<target> when determining the universe toolchain.

Browse Source 
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
This commit is contained in:
John Baldwin 2018-06-28 18:19:46 +00:00
parent e02d32f72e
commit 32cec12c75
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -587,14 +587,14 @@ universe_${target}_worlds: .PHONY
_need_clang_${target}_${target_arch} != \ _need_clang_${target}_${target_arch} != \
env TARGET=${target} TARGET_ARCH=${target_arch} \ env TARGET=${target} TARGET_ARCH=${target_arch} \
${SUB_MAKE} -C ${.CURDIR} -f Makefile.inc1 test-system-compiler \ ${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} .export _need_clang_${target}_${target_arch}
.endif .endif
.if !defined(_need_lld_${target}_${target_arch}) .if !defined(_need_lld_${target}_${target_arch})
_need_lld_${target}_${target_arch} != \ _need_lld_${target}_${target_arch} != \
env TARGET=${target} TARGET_ARCH=${target_arch} \ env TARGET=${target} TARGET_ARCH=${target_arch} \
${SUB_MAKE} -C ${.CURDIR} -f Makefile.inc1 test-system-linker \ ${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} .export _need_lld_${target}_${target_arch}
.endif .endif
# Setup env for each arch to use the one clang. # Setup env for each arch to use the one clang.