From: Matthew Fortune <matthew.fort...@imgtec.com> This fixes an issue where some G++ tests need to use a C compiler as well as C++ to build an LTO test.
contrib/ * test_installed: Use target to select default gcc/g++ etc. under test. Cherry-picked fc330482ef0a8f93d44b9ff4c458691d7785cc77 from https://github.com/MIPS/gcc Signed-off-by: Matthew Fortune <matthew.fort...@imgtec.com> Signed-off-by: Faraz Shahbazker <fshahbaz...@wavecomp.com> Signed-off-by: Aleksandar Rakic <aleksandar.ra...@htecgroup.com> --- contrib/test_installed | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/contrib/test_installed b/contrib/test_installed index fe9533e44b7..8de9cdf9847 100755 --- a/contrib/test_installed +++ b/contrib/test_installed @@ -110,10 +110,14 @@ set tmpdir "${tmpdir-`${PWDCMD-pwd}`}" set srcdir "${testsuite-${srcdir}/gcc/testsuite}" set CFLAGS "" set CXXFLAGS "" -set GCC_UNDER_TEST "${GCC_UNDER_TEST-${prefix}${prefix+/bin/}gcc}" -set GXX_UNDER_TEST "${GXX_UNDER_TEST-${prefix}${prefix+/bin/}g++}" -set GFORTRAN_UNDER_TEST "${GFORTRAN_UNDER_TEST-${prefix}${prefix+/bin/}gfortran}" -set OBJC_UNDER_TEST "${OBJC_UNDER_TEST-${prefix}${prefix+/bin/}gcc}" +set GCC_UNDER_TEST "${GCC_UNDER_TEST-${prefix}${prefix+/bin/}\ +${target+$target-}gcc}" +set GXX_UNDER_TEST "${GXX_UNDER_TEST-${prefix}${prefix+/bin/}\ +${target+$target-}g++}" +set GFORTRAN_UNDER_TEST "${GFORTRAN_UNDER_TEST-${prefix}${prefix+/bin/}\ +${target+$target-}gfortran}" +set OBJC_UNDER_TEST "${OBJC_UNDER_TEST-${prefix}${prefix+/bin/}\ +${target+$target-}gcc}" set HOSTCC "${HOSTCC-cc}" set HOSTCXX "${HOSTCXX-c++}" set HOSTCFLAGS "" -- 2.34.1