diff options
| author | Andreas Tobler <a.tobler@schweiz.org> | 2007-12-06 19:23:05 +0000 |
|---|---|---|
| committer | Andreas Tobler <andreast@gcc.gnu.org> | 2007-12-06 20:23:05 +0100 |
| commit | f390e54eae7a80106a8a46db9579a30eb12483d3 (patch) | |
| tree | 791c88a01547ee0160bc73866a7bd6b958a88b68 /libjava | |
| parent | 97f6bd406c546b1669a4231a12b62df236af2188 (diff) | |
| download | gcc-f390e54eae7a80106a8a46db9579a30eb12483d3.zip gcc-f390e54eae7a80106a8a46db9579a30eb12483d3.tar.gz gcc-f390e54eae7a80106a8a46db9579a30eb12483d3.tar.bz2 | |
jni.exp (gcj_jni_get_cxxflags_invocation): Make the testsuite multilib aware for Darwin.
2007-12-06 Andreas Tobler <a.tobler@schweiz.org>
* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Make
the testsuite multilib aware for Darwin.
From-SVN: r130657
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 18 |
2 files changed, 14 insertions, 9 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 31b06d9..1c96742 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2007-12-06 Andreas Tobler <a.tobler@schweiz.org> + + * testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Make + the testsuite multilib aware for Darwin. + 2007-12-05 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h: Regenerate. diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index 623597c..4ed27cd 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -241,6 +241,14 @@ proc gcj_jni_invocation_compile_c_to_binary {file {options {}}} { } proc gcj_jni_get_cxxflags_invocation {} { + global LIBJAVA + if [info exists LIBJAVA] { + set libjava $LIBJAVA; + } else { + set libjava [libjava_find_lib libjava gcj] + } + set cxxflags "$libjava -ljvm" + # Darwin needs -liconv linked, otherwise we get some unresolved. # If you're building the compiler with --prefix set to a place # where it's not yet installed, then the linker won't be able to @@ -249,15 +257,7 @@ proc gcj_jni_get_cxxflags_invocation {} { # to just make the linker find libgcc using -L options. # Similar logic applies to libgcj. if { [istarget "*-*-darwin*"] } { - set cxxflags "-L../.libs -shared-libgcc -ljvm -lgcj -liconv" - } else { - global LIBJAVA - if [info exists LIBJAVA] { - set libjava $LIBJAVA; - } else { - set libjava [libjava_find_lib libjava gcj] - } - set cxxflags "$libjava -ljvm" + lappend cxxflags -shared-libgcc -lgcj -liconv } if { [istarget "*-*-solaris*"] } { |