[PATCH v2 1/1] Ensure _UNDER_TEST executables are target based

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.

Signed-off-by: Matthew Fortune <matthew.fortune@imgtec.com>
Signed-off-by: Faraz Shahbazker <fshahbazker@wavecomp.com>
Signed-off-by: Aleksandar Rakic <aleksandar.rakic@htecgroup.com>

diff --git a/contrib/test_installed b/contrib/test_installed
index 9567ace54b3d0261e286de65f868abbafe9f42a3..a5427e44d4857f8fd06ec8a890f099befd1ad707 100755 (executable)
--- a/contrib/test_installed
+++ b/contrib/test_installed
@@ -131,10 +131,14 @@ set srcdir "${testsuite-${srcdir}/gcc/testsuite}"
 set libiconv "$libiconv"
 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 ""