jni.exp (gcj_jni_compile_c_to_so): Add check for HP-UX and add appropriate extension for shared libraries, sl.
2006-05-06 Andreas Tobler <a.tobler@schweiz.ch> * testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Add check for HP-UX and add appropriate extension for shared libraries, sl. (gcj_jni_test_one): Likewise. * testsuite/lib/libjava.exp (libjava_find_lib): Add sl to the shared library extensions. From-SVN: r113587
This commit is contained in:
parent
ed1a08a759
commit
b3638b64c3
3 changed files with 24 additions and 8 deletions
|
@ -10,13 +10,17 @@ proc gcj_jni_compile_c_to_so {file {options {}}} {
|
|||
set options_cxx $options
|
||||
set options ""
|
||||
|
||||
# apple uses a different extension for shared/dynamic libraries
|
||||
# Apple uses a different extension for shared/dynamic libraries
|
||||
# so we check against powerpc-apple-darwin and set them to
|
||||
# dylib, else we assume it's .so
|
||||
# dylib.
|
||||
# HP-UX uses sl, so we check this too, otherwise we take so.
|
||||
|
||||
if { [istarget "*-*-darwin*"] } {
|
||||
set so_extension "dylib"
|
||||
set so_flag "-dynamiclib"
|
||||
} elseif { [istarget "hppa*-hp-hpux*"] } {
|
||||
set so_extension "sl"
|
||||
set so_flag "-shared"
|
||||
} else {
|
||||
set so_extension "so"
|
||||
set so_flag "-shared"
|
||||
|
@ -76,12 +80,15 @@ proc gcj_jni_test_one {file} {
|
|||
global host_triplet
|
||||
global INTERPRETER
|
||||
|
||||
# apple uses a different extension for shared/dynamic libraries
|
||||
# Apple uses a different extension for shared/dynamic libraries
|
||||
# so we check against powerpc-apple-darwin and set them to
|
||||
# dylib, else we assume it's .so
|
||||
# dylib.
|
||||
# HP-UX uses sl, so we check this too, otherwise we take so.
|
||||
|
||||
if { [istarget "*-*-darwin*"] } {
|
||||
set so_extension "dylib"
|
||||
} elseif { [istarget "hppa*-hp-hpux*"] } {
|
||||
set so_extension "sl"
|
||||
} else {
|
||||
set so_extension "so"
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue