diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/lib/libstdc++.exp | 1 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/libstdc++-dg/normal.exp | 8 |
3 files changed, 14 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e1622f9..dfea3ea 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2003-11-19 Andreas Tobler <a.tobler@schweiz.ch> + + * testsuite/lib/libstdc++.exp: Add DYLD_LIBRARY_PATH for darwin. + * testsuite/libstdc++-dg/normal.exp: Add -multiply_defined suppress + flag. + 2003-11-18 Jonathan Wakely <redi@gcc.gnu.org> * docs/html/configopts.html, docs/html/debug.html, diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index f545389..9ea1acc 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -97,6 +97,7 @@ proc v3-init { args } { setenv LD_LIBRARY64_PATH $ld_library_path setenv LD_RUN_PATH $ld_library_path setenv LD_LIBRARY_PATH_64 $ld_library_path + setenv DYLD_LIBRARY_PATH $ld_library_path verbose -log "Set LD_*_PATHs to ${ld_library_path}" # Do a bunch of handstands and backflips for cross compiling and diff --git a/libstdc++-v3/testsuite/libstdc++-dg/normal.exp b/libstdc++-v3/testsuite/libstdc++-dg/normal.exp index 0ce6668..d6f4490 100644 --- a/libstdc++-v3/testsuite/libstdc++-dg/normal.exp +++ b/libstdc++-v3/testsuite/libstdc++-dg/normal.exp @@ -16,10 +16,16 @@ # libstdc++-v3 testsuite that uses the 'dg.exp' driver. +global target_triplet + # If a testcase doesn't have special options, use these. global DEFAULT_CXXFLAGS if ![info exists DEFAULT_CXXFLAGS] then { - set DEFAULT_CXXFLAGS "-D_GLIBCXX_ASSERT" + if { [string match "powerpc-*-darwin*" $target_triplet] } { + set DEFAULT_CXXFLAGS "-D_GLIBCXX_ASSERT -multiply_defined suppress" + } else { + set DEFAULT_CXXFLAGS "-D_GLIBCXX_ASSERT" + } } # Initialization. |