ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+2012-03-21 Peter Rosin <peda@lysator.liu.se>

Browse Source 
+
+       * testsuite/lib/target-libpath.exp [*-*-cygwin*, *-*-mingw*]
+       (set_ld_library_path_env_vars): Add the library search dir to PATH
+       (and save PATH for later).
+       (restore_ld_library_path_env_vars): Restore PATH.
This commit is contained in:
Anthony Green
2013-01-02 08:41:55 -05:00
parent 089dbce7cc
commit ccee09a4ff
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -314,6 +314,13 @@
(and save PATH for later). (and save PATH for later).
(restore_ld_library_path_env_vars): Restore PATH. (restore_ld_library_path_env_vars): Restore PATH.
2012-03-21 Peter Rosin <peda@lysator.liu.se>
* testsuite/lib/target-libpath.exp [*-*-cygwin*, *-*-mingw*]
(set_ld_library_path_env_vars): Add the library search dir to PATH
(and save PATH for later).
(restore_ld_library_path_env_vars): Restore PATH.
2012-03-20 Peter Rosin <peda@lysator.liu.se> 2012-03-20 Peter Rosin <peda@lysator.liu.se>
* testsuite/libffi.call/strlen2_win32.c (main): Remove bug. * testsuite/libffi.call/strlen2_win32.c (main): Remove bug.

22
testsuite/lib/target-libpath.exp
View File

@@ -25,7 +25,7 @@ set orig_ld_library64_path_saved 0
set orig_ld_library_path_32_saved 0 set orig_ld_library_path_32_saved 0
set orig_ld_library_path_64_saved 0 set orig_ld_library_path_64_saved 0
set orig_dyld_library_path_saved 0 set orig_dyld_library_path_saved 0
set orig_path_saved 0
####################################### #######################################
# proc set_ld_library_path_env_vars { } # proc set_ld_library_path_env_vars { }
@@ -42,6 +42,7 @@ proc set_ld_library_path_env_vars { } {
global orig_ld_library_path_32_saved global orig_ld_library_path_32_saved
global orig_ld_library_path_64_saved global orig_ld_library_path_64_saved
global orig_dyld_library_path_saved global orig_dyld_library_path_saved
global orig_path_saved
global orig_ld_library_path global orig_ld_library_path
global orig_ld_run_path global orig_ld_run_path
global orig_shlib_path global orig_shlib_path
@@ -50,6 +51,7 @@ proc set_ld_library_path_env_vars { } {
global orig_ld_library_path_32 global orig_ld_library_path_32
global orig_ld_library_path_64 global orig_ld_library_path_64
global orig_dyld_library_path global orig_dyld_library_path
global orig_path
global GCC_EXEC_PREFIX global GCC_EXEC_PREFIX
# Set the relocated compiler prefix, but only if the user hasn't specified one. # Set the relocated compiler prefix, but only if the user hasn't specified one.
@@ -100,6 +102,10 @@ proc set_ld_library_path_env_vars { } {
set orig_dyld_library_path "$env(DYLD_LIBRARY_PATH)" set orig_dyld_library_path "$env(DYLD_LIBRARY_PATH)"
set orig_dyld_library_path_saved 1 set orig_dyld_library_path_saved 1
} }
if [info exists env(PATH)] {
set orig_path "$env(PATH)"
set orig_path_saved 1
}
} }
# We need to set ld library path in the environment. Currently, # We need to set ld library path in the environment. Currently,
@@ -169,6 +175,13 @@ proc set_ld_library_path_env_vars { } {
} else { } else {
setenv DYLD_LIBRARY_PATH "$ld_library_path" setenv DYLD_LIBRARY_PATH "$ld_library_path"
} }
if { [istarget *-*-cygwin*] || [istarget *-*-mingw*] } {
if { $orig_path_saved } {
setenv PATH "$ld_library_path:$orig_path"
} else {
setenv PATH "$ld_library_path"
}
}
verbose -log "set_ld_library_path_env_vars: ld_library_path=$ld_library_path" verbose -log "set_ld_library_path_env_vars: ld_library_path=$ld_library_path"
} }
@@ -187,6 +200,7 @@ proc restore_ld_library_path_env_vars { } {
global orig_ld_library_path_32_saved global orig_ld_library_path_32_saved
global orig_ld_library_path_64_saved global orig_ld_library_path_64_saved
global orig_dyld_library_path_saved global orig_dyld_library_path_saved
global orig_path_saved
global orig_ld_library_path global orig_ld_library_path
global orig_ld_run_path global orig_ld_run_path
global orig_shlib_path global orig_shlib_path
@@ -195,6 +209,7 @@ proc restore_ld_library_path_env_vars { } {
global orig_ld_library_path_32 global orig_ld_library_path_32
global orig_ld_library_path_64 global orig_ld_library_path_64
global orig_dyld_library_path global orig_dyld_library_path
global orig_path
if { $orig_environment_saved == 0 } { if { $orig_environment_saved == 0 } {
return return
@@ -240,6 +255,11 @@ proc restore_ld_library_path_env_vars { } {
} elseif [info exists env(DYLD_LIBRARY_PATH)] { } elseif [info exists env(DYLD_LIBRARY_PATH)] {
unsetenv DYLD_LIBRARY_PATH unsetenv DYLD_LIBRARY_PATH
} }
if { $orig_path_saved } {
setenv PATH "$orig_path"
} elseif [info exists env(PATH)] {
unsetenv PATH
}
} }
####################################### #######################################