|
Lines 1-11
Link Here
|
| 1 |
--- ltmain.sh.orig Sun Apr 11 05:44:45 2004 |
1 |
--- ltmain.sh.orig Sat Aug 7 08:12:06 2004 |
| 2 |
+++ ltmain.sh Wed Jun 9 18:21:15 2004 |
2 |
+++ ltmain.sh Sun Sep 26 12:59:32 2004 |
| 3 |
@@ -1358,3 +1358,3 @@ |
3 |
@@ -1477,7 +1477,7 @@ |
|
|
4 |
esac |
| 5 |
elif test "X$arg" = "X-lc_r"; then |
| 4 |
case $host in |
6 |
case $host in |
| 5 |
- *-*-openbsd* | *-*-freebsd*) |
7 |
- *-*-openbsd* | *-*-freebsd*) |
| 6 |
+ *-*-openbsd* | *-*-freebsd4*) |
8 |
+ *-*-openbsd* | *-*-freebsd4*) |
| 7 |
# Do not include libc_r directly, use -pthread flag. |
9 |
# Do not include libc_r directly, use -pthread flag. |
| 8 |
@@ -1375,2 +1375,8 @@ |
10 |
continue |
|
|
11 |
;; |
| 12 |
@@ -1494,6 +1494,12 @@ |
| 13 |
|
| 14 |
-module) |
| 9 |
module=yes |
15 |
module=yes |
| 10 |
+ case $host in |
16 |
+ case $host in |
| 11 |
+ *-*-freebsd*) |
17 |
+ *-*-freebsd*) |
|
Lines 14-30
Link Here
|
| 14 |
+ ;; |
20 |
+ ;; |
| 15 |
+ esac |
21 |
+ esac |
| 16 |
continue |
22 |
continue |
| 17 |
@@ -1858,2 +1864,3 @@ |
23 |
;; |
|
|
24 |
|
| 25 |
@@ -1977,6 +1983,7 @@ |
| 26 |
finalize_deplibs="$deplib $finalize_deplibs" |
| 27 |
else |
| 18 |
deplibs="$deplib $deplibs" |
28 |
deplibs="$deplib $deplibs" |
| 19 |
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" |
29 |
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" |
| 20 |
fi |
30 |
fi |
| 21 |
@@ -4409,2 +4416,5 @@ |
31 |
continue |
|
|
32 |
;; |
| 33 |
@@ -4442,6 +4449,9 @@ |
| 34 |
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` |
| 35 |
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` |
| 22 |
;; |
36 |
;; |
| 23 |
+ *-*-freebsd*) |
37 |
+ *-*-freebsd*) |
| 24 |
+ # FreeBSD doesn't need this... |
38 |
+ # FreeBSD doesn't need this... |
| 25 |
+ ;; |
39 |
+ ;; |
| 26 |
*) |
40 |
*) |
| 27 |
@@ -5549,6 +5559,13 @@ |
41 |
$echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 |
|
|
42 |
exit $EXIT_FAILURE |
| 43 |
@@ -4460,7 +4470,7 @@ |
| 44 |
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then |
| 45 |
# Replace the output file specification. |
| 46 |
compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` |
| 47 |
- link_command="$compile_command$compile_rpath" |
| 48 |
+ link_command=`echo "$compile_command$compile_rpath" | sed 's/gcc\(3[34]\) /g++\1 /'` |
| 49 |
|
| 50 |
# We have no uninstalled library dependencies, so finalize right now. |
| 51 |
$show "$link_command" |
| 52 |
@@ -4524,7 +4534,7 @@ |
| 53 |
|
| 54 |
if test "$no_install" = yes; then |
| 55 |
# We don't need to create a wrapper script. |
| 56 |
- link_command="$compile_var$compile_command$compile_rpath" |
| 57 |
+ link_command=`echo "$compile_command$compile_rpath" | sed 's/gcc\(3[34]\) /g++\1 /'` |
| 58 |
# Replace the output file specification. |
| 59 |
link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` |
| 60 |
# Delete the old output file. |
| 61 |
@@ -4537,14 +4547,14 @@ |
| 62 |
|
| 63 |
if test "$hardcode_action" = relink; then |
| 64 |
# Fast installation is not supported |
| 65 |
- link_command="$compile_var$compile_command$compile_rpath" |
| 66 |
+ link_command=`echo "$compile_command$compile_rpath" | sed 's/gcc\(3[34]\) /g++\1 /'` |
| 67 |
relink_command="$finalize_var$finalize_command$finalize_rpath" |
| 68 |
|
| 69 |
$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 |
| 70 |
$echo "$modename: \`$output' will be relinked during installation" 1>&2 |
| 71 |
else |
| 72 |
if test "$fast_install" != no; then |
| 73 |
- link_command="$finalize_var$compile_command$finalize_rpath" |
| 74 |
+ link_command=`echo "$finalize_var$compile_command$compile_rpath" | sed 's/gcc\(3[34]\) /g++\1 /'` |
| 75 |
if test "$fast_install" = yes; then |
| 76 |
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` |
| 77 |
else |
| 78 |
@@ -4552,7 +4562,7 @@ |
| 79 |
relink_command= |
| 80 |
fi |
| 81 |
else |
| 82 |
- link_command="$compile_var$compile_command$compile_rpath" |
| 83 |
+ link_command=`echo "$compile_command$compile_rpath" | sed 's/gcc\(3[34]\) /g++\1 /'` |
| 84 |
relink_command="$finalize_var$finalize_command$finalize_rpath" |
| 85 |
fi |
| 86 |
fi |
| 87 |
@@ -5527,10 +5537,17 @@ |
| 88 |
fi |
| 89 |
|
| 28 |
# Install the pseudo-library for information purposes. |
90 |
# Install the pseudo-library for information purposes. |
| 29 |
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` |
91 |
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` |
| 30 |
- instname="$dir/$name"i |
92 |
- instname="$dir/$name"i |
|
Lines 42-44
Link Here
|
| 42 |
+ ;; |
104 |
+ ;; |
| 43 |
+ esac |
105 |
+ esac |
| 44 |
|
106 |
|
|
|
107 |
# Maybe install the static library, too. |
| 108 |
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" |