Skip to content

Commit dc1d1a3

Browse files
mfortuneJeff Law
authored andcommitted
[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 <[email protected]> Signed-off-by: Faraz Shahbazker <[email protected]> Signed-off-by: Aleksandar Rakic <[email protected]>
1 parent 4b61875 commit dc1d1a3

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

contrib/test_installed

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,14 @@ set srcdir "${testsuite-${srcdir}/gcc/testsuite}"
131131
set libiconv "$libiconv"
132132
set CFLAGS ""
133133
set CXXFLAGS ""
134-
set GCC_UNDER_TEST "${GCC_UNDER_TEST-${prefix}${prefix+/bin/}gcc}"
135-
set GXX_UNDER_TEST "${GXX_UNDER_TEST-${prefix}${prefix+/bin/}g++}"
136-
set GFORTRAN_UNDER_TEST "${GFORTRAN_UNDER_TEST-${prefix}${prefix+/bin/}gfortran}"
137-
set OBJC_UNDER_TEST "${OBJC_UNDER_TEST-${prefix}${prefix+/bin/}gcc}"
134+
set GCC_UNDER_TEST "${GCC_UNDER_TEST-${prefix}${prefix+/bin/}\
135+
${target+$target-}gcc}"
136+
set GXX_UNDER_TEST "${GXX_UNDER_TEST-${prefix}${prefix+/bin/}\
137+
${target+$target-}g++}"
138+
set GFORTRAN_UNDER_TEST "${GFORTRAN_UNDER_TEST-${prefix}${prefix+/bin/}\
139+
${target+$target-}gfortran}"
140+
set OBJC_UNDER_TEST "${OBJC_UNDER_TEST-${prefix}${prefix+/bin/}\
141+
${target+$target-}gcc}"
138142
set HOSTCC "${HOSTCC-cc}"
139143
set HOSTCXX "${HOSTCXX-c++}"
140144
set HOSTCFLAGS ""

0 commit comments

Comments
 (0)