⛏️ index : buildtools.git

author Oliver Tappe <zooey@hirschkaefer.de> 2014-07-21 15:04:11.0 +02:00:00
committer Oliver Tappe <zooey@hirschkaefer.de> 2014-07-22 17:07:52.0 +02:00:00
commit
affbe90c4cdaa78bec5e37c4ab25c6c8c2e32600 [patch]
tree
0189df9bcf11fd9dbf9bf15e73012d3a68b1f88c
parent
9f6654f4a86ec123bb690190714db3e949fa80bb
download
affbe90c4cdaa78bec5e37c4ab25c6c8c2e32600.tar.gz

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



Diff

 gcc/libtool.m4 | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/gcc/libtool.m4 b/gcc/libtool.m4
index 5038c84..daf6268 100644
--- a/gcc/libtool.m4
+++ b/gcc/libtool.m4
@@ -1137,7 +1137,7 @@
# Invoke $ECHO with all args, space-separated.
func_echo_all ()
{
    $ECHO "$*" 
    $ECHO "$*"
}

case "$ECHO" in
@@ -2184,7 +2184,7 @@
  esac
  ;;

beos* | haiku*)
beos*)
  library_names_spec='${libname}${shared_ext}'
  dynamic_linker="$host_os ld.so"
  shlibpath_var=LIBRARY_PATH
@@ -2342,8 +2342,9 @@
  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 @@
  lt_cv_deplibs_check_method=pass_all
  ;;

beos* | haiku*)
beos*)
  lt_cv_deplibs_check_method=pass_all
  ;;

@@ -3603,7 +3604,7 @@
        ;;
      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 @@
      ;;
    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 @@
      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 @@

    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 @@
      ;;

    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 @@
        ;;

      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*)