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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73727 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fd389b5..0f66268 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -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

diff --git a/gcc/testsuite/g++.dg/compat/compat.exp b/gcc/testsuite/g++.dg/compat/compat.exp
index f6c1bbd..1adb456 100644 (file)
--- a/gcc/testsuite/g++.dg/compat/compat.exp
+++ b/gcc/testsuite/g++.dg/compat/compat.exp
@@ -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
 }
 
 #

diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index 81ac484..cfefeee 100644 (file)
--- a/gcc/testsuite/lib/g++.exp
+++ b/gcc/testsuite/lib/g++.exp
@@ -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

diff --git a/gcc/testsuite/lib/g77.exp b/gcc/testsuite/lib/g77.exp
index 8f20eb4..6e182d4 100644 (file)
--- a/gcc/testsuite/lib/g77.exp
+++ b/gcc/testsuite/lib/g77.exp
@@ -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"
 }

diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp
index 1817c70..ab6377e 100644 (file)
--- a/gcc/testsuite/lib/objc.exp
+++ b/gcc/testsuite/lib/objc.exp
@@ -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]
 }