diff options
Diffstat (limited to 'libjava/configure')
-rwxr-xr-x | libjava/configure | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libjava/configure b/libjava/configure index cf52939df11..bfaf3c8d485 100755 --- a/libjava/configure +++ b/libjava/configure @@ -4349,7 +4349,14 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) - lt_cv_deplibs_check_method=pass_all + case $host_cpu in + alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* | sh* ) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; netbsd* | knetbsd*-gnu) @@ -4743,7 +4750,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4746 "configure"' > conftest.$ac_ext + echo '#line 4753 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5774,7 +5781,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : else cat > conftest.$ac_ext << EOF -#line 5777 "configure" +#line 5784 "configure" struct S { ~S(); }; void bar(); void foo() |