c0f325e33c
The previous patch could cause problems in a couple of oddball cases. So, set need_version=yes for a.out, and hack avoid-version so it works on a.out platforms.
65 lines
1.8 KiB
Text
65 lines
1.8 KiB
Text
$NetBSD: patch-ab,v 1.12 2000/11/26 11:22:40 mycroft Exp $
|
|
|
|
--- ltmain.in.orig Sat May 27 01:53:15 2000
|
|
+++ ltmain.in Sun Nov 26 11:19:57 2000
|
|
@@ -819,6 +819,7 @@
|
|
old_convenience=
|
|
deplibs=
|
|
linkopts=
|
|
+ wllinkopts=
|
|
|
|
if test -n "$shlibpath_var"; then
|
|
# get the directories listed in $shlibpath_var
|
|
@@ -1154,6 +1155,25 @@
|
|
continue
|
|
;;
|
|
|
|
+ -Wl,*)
|
|
+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
|
|
+ arg=
|
|
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS=','
|
|
+ for flag in $args; do
|
|
+ IFS="$save_ifs"
|
|
+ case "$flag" in
|
|
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
|
|
+ flag="\"$flag\""
|
|
+ ;;
|
|
+ esac
|
|
+ arg="$arg $wl$flag"
|
|
+ linkopts="$linkopts $flag"
|
|
+ wllinkopts="$wllinkopts $wl$flag"
|
|
+ done
|
|
+ IFS="$save_ifs"
|
|
+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
|
|
+ ;;
|
|
+
|
|
# Some other compiler flag.
|
|
-* | +*)
|
|
# Unknown arguments in both finalize_command and compile_command need
|
|
@@ -1772,7 +1792,7 @@
|
|
fi
|
|
|
|
# Remove version info from name if versioning should be avoided
|
|
- if test "$avoid_version" = yes && test "$need_version" = no; then
|
|
+ if test "$avoid_version" = yes; then
|
|
major=
|
|
versuffix=
|
|
verstring=""
|
|
@@ -1799,6 +1819,9 @@
|
|
# rhapsody is a little odd...
|
|
deplibs="$deplibs -framework System"
|
|
;;
|
|
+ *-*-netbsd*)
|
|
+ # Don't link with libc until the a.out ld.so is fixed.
|
|
+ ;;
|
|
*)
|
|
# Add libc to deplibs on all other systems.
|
|
deplibs="$deplibs -lc"
|
|
@@ -2146,6 +2169,7 @@
|
|
if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
|
|
eval flag=\"$thread_safe_flag_spec\"
|
|
linkopts="$linkopts $flag"
|
|
+ wllinkopts="$wllinkopts $wl$flag"
|
|
fi
|
|
|
|
# Do each of the archive commands.
|