59 lines
2.0 KiB
Diff
59 lines
2.0 KiB
Diff
|
diff --git a/libitm/testsuite/Makefile.am b/libitm/testsuite/Makefile.am
|
||
|
|
index a9a0144185a..a19101aac54 100644
|
||
|
|
--- a/libitm/testsuite/Makefile.am
|
||
|
|
+++ b/libitm/testsuite/Makefile.am
|
||
|
|
@@ -11,3 +11,9 @@ EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
|
||
|
|
_RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
|
||
|
|
echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
|
||
|
|
RUNTEST = "$(_RUNTEST) $(AM_RUNTESTFLAGS)"
|
||
|
|
+
|
||
|
|
+EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
|
||
|
|
+
|
||
|
|
+extra.exp:
|
||
|
|
+ echo 'set BUILD_CC "$(CC)"' > $@.tmp
|
||
|
|
+ mv $@.tmp $@
|
||
|
|
diff --git a/libitm/testsuite/Makefile.in b/libitm/testsuite/Makefile.in
|
||
|
|
index eb9e992279d..1250e7f9a5a 100644
|
||
|
|
--- a/libitm/testsuite/Makefile.in
|
||
|
|
+++ b/libitm/testsuite/Makefile.in
|
||
|
|
@@ -234,6 +234,7 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
|
||
|
|
echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
|
||
|
|
|
||
|
|
RUNTEST = "$(_RUNTEST) $(AM_RUNTESTFLAGS)"
|
||
|
|
+EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
|
||
|
|
all: all-am
|
||
|
|
|
||
|
|
.SUFFIXES:
|
||
|
|
@@ -440,6 +441,10 @@ uninstall-am:
|
||
|
|
uninstall uninstall-am
|
||
|
|
|
||
|
|
|
||
|
|
+extra.exp:
|
||
|
|
+ echo 'set BUILD_CC "$(CC)"' > $@.tmp
|
||
|
|
+ mv $@.tmp $@
|
||
|
|
+
|
||
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||
|
|
.NOEXPORT:
|
||
|
|
diff --git a/libitm/testsuite/lib/libitm.exp b/libitm/testsuite/lib/libitm.exp
|
||
|
|
index 041629687f6..748f492c03d 100644
|
||
|
|
--- a/libitm/testsuite/lib/libitm.exp
|
||
|
|
+++ b/libitm/testsuite/lib/libitm.exp
|
||
|
|
@@ -74,6 +74,7 @@ proc libitm_init { args } {
|
||
|
|
global ALWAYS_CFLAGS
|
||
|
|
global CFLAGS
|
||
|
|
global TOOL_EXECUTABLE TOOL_OPTIONS
|
||
|
|
+ global BUILD_CC
|
||
|
|
global GCC_UNDER_TEST
|
||
|
|
global TESTING_IN_BUILD_TREE
|
||
|
|
global target_triplet
|
||
|
|
@@ -89,6 +90,8 @@ proc libitm_init { args } {
|
||
|
|
if ![info exists GCC_UNDER_TEST] then {
|
||
|
|
if [info exists TOOL_EXECUTABLE] {
|
||
|
|
set GCC_UNDER_TEST $TOOL_EXECUTABLE
|
||
|
|
+ } elseif [info exists BUILD_CC] {
|
||
|
|
+ set GCC_UNDER_TEST $BUILD_CC
|
||
|
|
} else {
|
||
|
|
set GCC_UNDER_TEST "[find_gcc]"
|
||
|
|
}
|