diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-17 05:13:27 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-17 05:13:27 +0000 |
| commit | ae71e4294809d2e42f7f512b87221cd29c62f079 (patch) | |
| tree | 0e52b2f146f8c1248ee0f64ebe3a3ddc65c36840 /gcc | |
| parent | 8e8d2ba2cfc9049c0cf4a4c1b69464117169c480 (diff) | |
| download | gcc-ae71e4294809d2e42f7f512b87221cd29c62f079.tar.gz | |
2008-07-17 H.J. Lu <hongjiu.lu@intel.com>
PR testsuite/36443
* objc.dg/gnu-encoding/gnu-encoding.exp: Temporarily unset
GCC_EXEC_PREFIX from environment when running $HOSTCC.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137909 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 76d17516bc6..0eb8eaa2baf 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2008-07-17 H.J. Lu <hongjiu.lu@intel.com> + + PR testsuite/36443 + * objc.dg/gnu-encoding/gnu-encoding.exp: Temporarily unset + GCC_EXEC_PREFIX from environment when running $HOSTCC. + 2008-07-16 Dodji Seketeli <dseketel@redhat.com> PR c++/13699 diff --git a/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp b/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp index dc4d9245a32..75d1dcf6316 100644 --- a/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp +++ b/gcc/testsuite/objc.dg/gnu-encoding/gnu-encoding.exp @@ -37,8 +37,20 @@ set generator_src "$srcdir/$subdir/struct-layout-encoding-1_generate.c" 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 $generator_src" +# Temporarily unset GCC_EXEC_PREFIX from environment, as that might +# confuse the $HOSTCC. +set orig_gcc_exec_prefix_saved 0 +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 build "$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 |