compat.exp: Add DYLD_LIBRARY_PATH for darwin.

2003-11-19  Andreas Tobler  <a.tobler@schweiz.ch>

	* g++.dg/compat/compat.exp: Add DYLD_LIBRARY_PATH for darwin.
	* lib/g77.exp: Likewise.
	* lib/objc.exp: Likewise.
	* lib/g++.exp: Likewise, add -multiply_defined suppress flag
	for darwin.

From-SVN: r73727
This commit is contained in:
Andreas Tobler 2003-11-19 05:58:34 +01:00 committed by Andreas Tobler
parent 70d8f2a1b2
commit 5153e857f7
5 changed files with 17 additions and 0 deletions

View File

@ -1,3 +1,11 @@
2003-11-19 Andreas Tobler <a.tobler@schweiz.ch>
* g++.dg/compat/compat.exp: Add DYLD_LIBRARY_PATH for darwin.
* lib/g77.exp: Likewise.
* lib/objc.exp: Likewise.
* lib/g++.exp: Likewise, add -multiply_defined suppress flag
for darwin.
2003-11-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net>
PR c++/12932

View File

@ -47,6 +47,7 @@ proc compat-fix-library-path { } {
setenv SHLIB_PATH $ld_library_path
setenv LD_LIBRARYN32_PATH $ld_library_path
setenv LD_LIBRARY64_PATH $ld_library_path
setenv DYLD_LIBRARY_PATH $ld_library_path
}
#

View File

@ -176,6 +176,7 @@ proc g++_link_flags { paths } {
setenv SHLIB_PATH $ld_library_path
setenv LD_LIBRARYN32_PATH $ld_library_path
setenv LD_LIBRARY64_PATH $ld_library_path
setenv DYLD_LIBRARY_PATH $ld_library_path
return "$flags"
}
@ -196,6 +197,7 @@ proc g++_init { args } {
global TOOL_EXECUTABLE TOOL_OPTIONS
global GXX_UNDER_TEST
global TESTING_IN_BUILD_TREE
global target_triplet
if ![info exists GXX_UNDER_TEST] then {
if [info exists TOOL_EXECUTABLE] {
@ -259,6 +261,10 @@ proc g++_init { args } {
# error-message parsing machinery.
lappend ALWAYS_CXXFLAGS "additional_flags=-fmessage-length=0"
if { [string match "powerpc-*-darwin*" $target_triplet] } {
lappend ALWAYS_CXXFLAGS "ldflags=-multiply_defined suppress"
}
verbose -log "ALWAYS_CXXFLAGS set to $ALWAYS_CXXFLAGS"
verbose "g++ is initialized" 3

View File

@ -120,6 +120,7 @@ proc g77_link_flags { paths } {
setenv SHLIB_PATH $ld_library_path
setenv LD_LIBRARYN32_PATH $ld_library_path
setenv LD_LIBRARY64_PATH $ld_library_path
setenv DYLD_LIBRARY_PATH $ld_library_path
return "$flags"
}

View File

@ -194,6 +194,7 @@ proc objc_target_compile { source dest type options } {
setenv SHLIB_PATH $ld_library_path
setenv LD_LIBRARYN32_PATH $ld_library_path
setenv LD_LIBRARY64_PATH $ld_library_path
setenv DYLD_LIBRARY_PATH $ld_library_path
return [target_compile $source $dest $type $options]
}