svn commit: r335769 - head

[John Baldwin]

Author: jhb
Date: Thu Jun 28 18:19:46 2018
New Revision: 335769
URL: https://svnweb.freebsd.org/changeset/base/335769

Log:
  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

Modified:
  head/Makefile

Modified: head/Makefile
==============================================================================
--- head/Makefile	Thu Jun 28 18:17:20 2018	(r335768)
+++ head/Makefile	Thu Jun 28 18:19:46 2018	(r335769)
@@ -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.