diff options
| author | Andreas Tobler <a.tobler@schweiz.ch> | 2004-06-18 22:56:56 +0200 |
|---|---|---|
| committer | Andreas Tobler <andreast@gcc.gnu.org> | 2004-06-18 22:56:56 +0200 |
| commit | cfc74dce2ab985c8cfe485147de89ead9a2a701c (patch) | |
| tree | b83d02a101454f1db432cf904029d298818c5427 /libjava | |
| parent | 3b1cce6ac1ed8fe740b0b1730bb6bbb63304f1e3 (diff) | |
| download | gcc-cfc74dce2ab985c8cfe485147de89ead9a2a701c.zip gcc-cfc74dce2ab985c8cfe485147de89ead9a2a701c.tar.gz gcc-cfc74dce2ab985c8cfe485147de89ead9a2a701c.tar.bz2 | |
jni.exp (gcj_jni_test_one): Add lgcc_s for darwin.
2004-06-18 Andreas Tobler <a.tobler@schweiz.ch>
* testsuite/libjava.jni/jni.exp (gcj_jni_test_one): Add lgcc_s for
darwin.
From-SVN: r83360
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 20b0726..b77c9a9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2004-06-18 Andreas Tobler <a.tobler@schweiz.ch> + + * testsuite/libjava.jni/jni.exp (gcj_jni_test_one): Add lgcc_s for + darwin. + 2004-06-18 Ranjit Mathew <rmathew@hotmail.com> * prims.cc (_Jv_CreateJavaVM): Install SEGV and FPE handlers, diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index b1f6d4e..838b833 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -11,7 +11,7 @@ proc gcj_jni_compile_c_to_so {file {options {}}} { set options "" # apple uses a different extension for shared/dynamic libraries -# so we check against powerpc-apple-darwin and set them to +# so we check against powerpc-apple-darwin and set them to # dylib, else we assume it's .so if { [ regexp {powerpc-apple-darwin} $host_triplet] } { @@ -131,7 +131,15 @@ proc gcj_jni_test_one {file} { lappend cxxflaglist "-L$cxxldlibflags" } - lappend cxxflaglist "-lstdc++" + # Darwin does not yet have a libgcc_s.dylib library. + # So we add it here. If the libgcc_s is installed, the libstdc++ + # would pick it up. + if { [ regexp {powerpc-apple-darwin} $host_triplet] } { + lappend cxxflaglist "-lgcc_s -lstdc++" + } else { + lappend cxxflaglist "-lstdc++" + } + set cxxflags [join $cxxflaglist] } |