OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(restore_ld_library_path_env_vars): Always restore GCC_EXEC_PREFIX to its original value...

Browse Source 
2009-04-01  H.J. Lu  <hongjiu.lu@intel.com>

	(restore_ld_library_path_env_vars): Always restore GCC_EXEC_PREFIX
	to its original value, or unset if it was not defined.

From-SVN: r145400
This commit is contained in:
H.J. Lu 2009-04-01 12:36:21 +00:00 committed by H.J. Lu
parent 3f293bd000
commit 00c7e24fdd
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2009-04-01 H.J. Lu <hongjiu.lu@intel.com>
(restore_ld_library_path_env_vars): Always restore GCC_EXEC_PREFIX
to its original value, or unset if it was not defined.
2009-03-31 Jason Merrill <jason@redhat.com> 2009-03-31 Jason Merrill <jason@redhat.com>
* g++.old-deja/g++.other/using9.C: Add expected errors. * g++.old-deja/g++.other/using9.C: Add expected errors.

8
gcc/testsuite/lib/target-libpath.exp
View File

@ -213,16 +213,16 @@ proc restore_ld_library_path_env_vars { } {
global orig_gcc_exec_prefix global orig_gcc_exec_prefix
global env global env
if { $orig_environment_saved == 0 } {
return
}
if { $orig_gcc_exec_prefix_saved } { if { $orig_gcc_exec_prefix_saved } {
setenv GCC_EXEC_PREFIX "$orig_gcc_exec_prefix" setenv GCC_EXEC_PREFIX "$orig_gcc_exec_prefix"
} elseif [info exists env(GCC_EXEC_PREFIX)] { } elseif [info exists env(GCC_EXEC_PREFIX)] {
unsetenv GCC_EXEC_PREFIX unsetenv GCC_EXEC_PREFIX
} }
if { $orig_environment_saved == 0 } {
return
}
if { $orig_ld_library_path_saved } { if { $orig_ld_library_path_saved } {
setenv LD_LIBRARY_PATH "$orig_ld_library_path" setenv LD_LIBRARY_PATH "$orig_ld_library_path"
} elseif [info exists env(LD_LIBRARY_PATH)] { } elseif [info exists env(LD_LIBRARY_PATH)] {