Apply shared-library-related fixes to libtool.m4, too.

This commit is contained in:
Oliver Tappe 2014-07-21 15:04:11 +02:00
parent 9f6654f4a8
commit affbe90c4c

27
gcc/libtool.m4 vendored
View File

@ -1137,7 +1137,7 @@ fi
# Invoke $ECHO with all args, space-separated.
func_echo_all ()
{
$ECHO "$*"
$ECHO "$*"
}
case "$ECHO" in
@ -2184,7 +2184,7 @@ amigaos*)
esac
;;
beos* | haiku*)
beos*)
library_names_spec='${libname}${shared_ext}'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
@ -2342,8 +2342,9 @@ haiku*)
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LIBRARY_PATH
shlibpath_overrides_runpath=yes
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
sys_lib_search_path_spec='/boot/system/non-packaged/develop/lib /boot/system/develop/lib'
sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/system/non-packaged/lib /boot/system/lib'
hardcode_into_libs=no
;;
hpux9* | hpux10* | hpux11*)
@ -2991,7 +2992,7 @@ aix[[4-9]]*)
lt_cv_deplibs_check_method=pass_all
;;
beos* | haiku*)
beos*)
lt_cv_deplibs_check_method=pass_all
;;
@ -3603,7 +3604,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
mingw* | cygwin* | os2* | pw32* | cegcc*)
@ -3625,8 +3626,6 @@ m4_if([$1], [CXX], [
;;
haiku*)
# PIC is the default for Haiku.
# The "-static" flag exists, but is broken.
_LT_TAGVAR(lt_prog_compiler_static, $1)=
;;
interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
@ -3915,7 +3914,7 @@ m4_if([$1], [CXX], [
esac
;;
beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
# PIC is the default for these OSes.
;;
@ -3936,8 +3935,6 @@ m4_if([$1], [CXX], [
haiku*)
# PIC is the default for Haiku.
# The "-static" flag exists, but is broken.
_LT_TAGVAR(lt_prog_compiler_static, $1)=
;;
hpux*)
@ -4429,8 +4426,8 @@ _LT_EOF
;;
haiku*)
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
interix[[3-9]]*)
@ -5785,8 +5782,8 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
haiku*)
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
hpux9*)