diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-06-12 13:17:05 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-06-12 13:17:05 +0200 |
| commit | b5a6bf2e7efa45182f8a730d0c8e845a313754c4 (patch) | |
| tree | 5cf66b4852b0c7d6ec5aeabbd2b1457049f08639 /gcc | |
| parent | c34938a8aa48af61df1835c2c0dab95d4ef6ca1a (diff) | |
| download | gcc-b5a6bf2e7efa45182f8a730d0c8e845a313754c4.zip gcc-b5a6bf2e7efa45182f8a730d0c8e845a313754c4.tar.gz gcc-b5a6bf2e7efa45182f8a730d0c8e845a313754c4.tar.bz2 | |
re PR testsuite/36443 (HOSTCC doesn't work with installed gcc)
PR testsuite/36443
* gcc.dg/compat/struct-layout-1.exp: Temporarily unset
GCC_EXEC_PREFIX from environment when running $HOSTCC.
* g++.dg/compat/struct-layout-1.exp: Likewise.
From-SVN: r136698
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/compat/struct-layout-1.exp | 11 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/compat/struct-layout-1.exp | 11 |
3 files changed, 29 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7155d91..55555f7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2008-06-12 Jakub Jelinek <jakub@redhat.com> + + PR testsuite/36443 + * gcc.dg/compat/struct-layout-1.exp: Temporarily unset + GCC_EXEC_PREFIX from environment when running $HOSTCC. + * g++.dg/compat/struct-layout-1.exp: Likewise. + 2008-06-12 Richard Guenther <rguenther@suse.de> PR tree-optimization/36345 diff --git a/gcc/testsuite/g++.dg/compat/struct-layout-1.exp b/gcc/testsuite/g++.dg/compat/struct-layout-1.exp index 8aaa79e..edaf1fa 100644 --- a/gcc/testsuite/g++.dg/compat/struct-layout-1.exp +++ b/gcc/testsuite/g++.dg/compat/struct-layout-1.exp @@ -128,8 +128,19 @@ set generator_src "$generator_src $srcdir/$subdir/../../gcc.dg/compat/generate-r set generator_src "$generator_src $srcdir/$subdir/../../gcc.dg/compat/generate-random_r.c" set generator_cmd "-o $generator $generator_src" +# Temporarily unset GCC_EXEC_PREFIX from environment, as that might +# confuse the $HOSTCC. +if [info exists env(GCC_EXEC_PREFIX)] { + set orig_gcc_exec_prefix "$env(GCC_EXEC_PREFIX)" + set orig_gcc_exec_prefix_saved 1 + unsetenv GCC_EXEC_PREFIX +} set status [remote_exec host "$HOSTCC $HOSTCFLAGS $generator_cmd"] set status [lindex $status 0] +if { $orig_gcc_exec_prefix_saved } { + set orig_gcc_exec_prefix_saved 0 + setenv GCC_EXEC_PREFIX "$orig_gcc_exec_prefix" +} if { $status == 0 } then { file delete -force $tstobjdir file mkdir $tstobjdir diff --git a/gcc/testsuite/gcc.dg/compat/struct-layout-1.exp b/gcc/testsuite/gcc.dg/compat/struct-layout-1.exp index f26abc5..47588c9 100644 --- a/gcc/testsuite/gcc.dg/compat/struct-layout-1.exp +++ b/gcc/testsuite/gcc.dg/compat/struct-layout-1.exp @@ -90,8 +90,19 @@ set generator_src "$generator_src $srcdir/$subdir/generate-random.c" set generator_src "$generator_src $srcdir/$subdir/generate-random_r.c" set generator_cmd "-o $generator $skip_dfp $generator_src" +# Temporarily unset GCC_EXEC_PREFIX from environment, as that might +# confuse the $HOSTCC. +if [info exists env(GCC_EXEC_PREFIX)] { + set orig_gcc_exec_prefix "$env(GCC_EXEC_PREFIX)" + set orig_gcc_exec_prefix_saved 1 + unsetenv GCC_EXEC_PREFIX +} set status [remote_exec host "$HOSTCC $HOSTCFLAGS $generator_cmd"] set status [lindex $status 0] +if { $orig_gcc_exec_prefix_saved } { + set orig_gcc_exec_prefix_saved 0 + setenv GCC_EXEC_PREFIX "$orig_gcc_exec_prefix" +} if { $status == 0 } then { file delete -force $tstobjdir file mkdir $tstobjdir |