diff options
| author | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-05-03 22:37:50 +0000 |
|---|---|---|
| committer | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-05-03 22:37:50 +0000 |
| commit | b1417fdc54abfce7d1487f4a443472e7ffbd6f8c (patch) | |
| tree | 2387c5eeb21780304270d962ecd76911de6f0191 /libjava/testsuite/libjava.jni/jni.exp | |
| parent | bb9c1a09933d3b672bedb16747761d478245dddc (diff) | |
| download | gcc-b1417fdc54abfce7d1487f4a443472e7ffbd6f8c.tar.gz | |
PR 43839
* testsuite/Makefile.am: Override automake for site.exp creation
and add entry to set libiconv.
* testsuite/Makefile.in: Regenerate.
* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation):
Add new global variable libiconv to handle alternative libiconv
locations.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159009 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/testsuite/libjava.jni/jni.exp')
| -rw-r--r-- | libjava/testsuite/libjava.jni/jni.exp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp index 68dbd279033..dbeced481a8 100644 --- a/libjava/testsuite/libjava.jni/jni.exp +++ b/libjava/testsuite/libjava.jni/jni.exp @@ -251,7 +251,11 @@ proc gcj_jni_invocation_compile_c_to_binary {file {options {}}} { } proc gcj_jni_get_cxxflags_invocation {} { + global libiconv global LIBJAVA + if {$libiconv == ""} { + set libiconv "-liconv" + } if [info exists LIBJAVA] { set libjava $LIBJAVA; } else { @@ -267,7 +271,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*"] } { - lappend cxxflags -shared-libgcc -lgcj -liconv + eval lappend cxxflags "-shared-libgcc -lgcj $libiconv" } if { [istarget "*-*-solaris*"] } { |