mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-02 12:10:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

g++.exp: Fix handling of LD_LIBRARY_PATH et al

Browse Source 
2002-03-25  David Billinghurst  <David.Billinghurst@riotinto.com>

	* lib/g++.exp:  Fix handling of LD_LIBRARY_PATH et al
	* lib/g77.exp:  Likewise
	* lib/objc.exp: Likewise

From-SVN: r51279
This commit is contained in:
David Billinghurst 2002-03-24 23:41:22 +00:00 committed by David Billinghurst
parent e1a0d743f1
commit 12c3717eaf
4 changed files with 42 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2002-03-25 David Billinghurst <David.Billinghurst@riotinto.com>
* lib/g++.exp: Fix handling of LD_LIBRARY_PATH et al
* lib/g77.exp: Likewise
* lib/objc.exp: Likewise
2002-03-23 Andrew Cagney <ac131313@redhat.com>
* gcc.dg/Wswitch-default.c: New test.

29
gcc/testsuite/lib/g++.exp
View File

@ -159,6 +159,18 @@ proc g++_link_flags { paths } {
append flags "-L${librx} ";
}
}
# On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but
# called LD_LIBRARYN32_PATH (for the N32 ABI) and LD_LIBRARY64_PATH
# (for the 64-bit ABI). The right way to do this would be to modify
# unix.exp -- but that's not an option since it's part of DejaGNU
# proper, so we do it here. We really only need to do
# this on IRIX, but it shouldn't hurt to do it anywhere else.
setenv LD_LIBRARY_PATH $ld_library_path
setenv SHLIB_PATH $ld_library_path
setenv LD_LIBRARYN32_PATH $ld_library_path
setenv LD_LIBRARY64_PATH $ld_library_path
return "$flags"
}
@ -278,23 +290,6 @@ proc g++_target_compile { source dest type options } {
return [target_compile $source $dest $type $options]
}
#
# g++_set_ld_library_path --
# On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but
# called LD_LIBRARYN32_PATH (for the N32 ABI) and LD_LIBRARY64_PATH
# (for the 64-bit ABI). The right way to do this would be to modify
# unix.exp -- but that's not an option since it's part of DejaGNU
# proper, so we do it here, by trickery. We really only need to do
# this on IRIX, but it shouldn't hurt to do it anywhere else.
#
proc ${tool}_set_ld_library_path { name element op } {
setenv LD_LIBRARYN32_PATH [getenv LD_LIBRARY_PATH]
setenv LD_LIBRARY64_PATH [getenv LD_LIBRARY_PATH]
}
trace variable env(LD_LIBRARY_PATH) w ${tool}_set_ld_library_path
#
# ${tool}_option_help
#

29
gcc/testsuite/lib/g77.exp
View File

@ -94,6 +94,18 @@ proc g77_link_flags { paths } {
}
append ld_library_path ":${rootme}"
}
# On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but
# called LD_LIBRARYN32_PATH (for the N32 ABI) and LD_LIBRARY64_PATH
# (for the 64-bit ABI). The right way to do this would be to modify
# unix.exp -- but that's not an option since it's part of DejaGNU
# proper, so we do it here. We really only need to do
# this on IRIX, but it shouldn't hurt to do it anywhere else.
setenv LD_LIBRARY_PATH $ld_library_path
setenv SHLIB_PATH $ld_library_path
setenv LD_LIBRARYN32_PATH $ld_library_path
setenv LD_LIBRARY64_PATH $ld_library_path
return "$flags"
}
@ -191,20 +203,3 @@ proc g77_target_compile { source dest type options } {
return [target_compile $source $dest $type $options]
}
#
# g77_set_ld_library_path --
# On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but
# called LD_LIBRARYN32_PATH (for the N32 ABI) and LD_LIBRARY64_PATH
# (for the 64-bit ABI). The right way to do this would be to modify
# unix.exp -- but that's not an option since it's part of DejaGNU
# proper, so we do it here, by trickery. We really only need to do
# this on IRIX, but it shouldn't hurt to do it anywhere else.
#
proc ${tool}_set_ld_library_path { name element op } {
setenv LD_LIBRARYN32_PATH [getenv LD_LIBRARY_PATH]
setenv LD_LIBRARY64_PATH [getenv LD_LIBRARY_PATH]
}
trace variable env(LD_LIBRARY_PATH) w ${tool}_set_ld_library_path

26
gcc/testsuite/lib/objc.exp
View File

@ -157,6 +157,18 @@ proc objc_target_compile { source dest type options } {
append ld_library_path ":${libobjc_dir}"
}
lappend options "compiler=$OBJC_UNDER_TEST"
# On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but
# called LD_LIBRARYN32_PATH (for the N32 ABI) and LD_LIBRARY64_PATH
# (for the 64-bit ABI). The right way to do this would be to modify
# unix.exp -- but that's not an option since it's part of DejaGNU
# proper, so we do it here. We really only need to do
# this on IRIX, but it shouldn't hurt to do it anywhere else.
setenv LD_LIBRARY_PATH $ld_library_path
setenv SHLIB_PATH $ld_library_path
setenv LD_LIBRARYN32_PATH $ld_library_path
setenv LD_LIBRARY64_PATH $ld_library_path
return [target_compile $source $dest $type $options]
}
@ -241,20 +253,6 @@ if { [info procs prune_warnings] == "" } then {
}
}
# On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but
# called LD_LIBRARYN32_PATH (for the N32 ABI) and LD_LIBRARY64_PATH
# (for the 64-bit ABI). The right way to do this would be to modify
# unix.exp -- but that's not an option since it's part of DejaGNU
# proper, so we do it here, by trickery. We really only need to do
# this on IRIX, but it shouldn't hurt to do it anywhere else.
proc ${tool}_set_ld_library_path { name element op } {
setenv LD_LIBRARYN32_PATH [getenv LD_LIBRARY_PATH]
setenv LD_LIBRARY64_PATH [getenv LD_LIBRARY_PATH]
}
trace variable env(LD_LIBRARY_PATH) w ${tool}_set_ld_library_path
# Utility used by mike-gcc.exp and c-torture.exp.
# Check the compiler(/assembler/linker) output for text indicating that
# the testcase should be marked as "unsupported".