106 lines
3.2 KiB
Bash
106 lines
3.2 KiB
Bash
--- ltmain.sh.orig 2003-12-10 11:45:44.000000000 -0500
|
|
+++ ltmain.sh 2004-01-14 23:27:25.000000000 -0500
|
|
@@ -1051,15 +1051,18 @@ compiler."
|
|
;;
|
|
|
|
-l*)
|
|
- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
|
|
- case $host in
|
|
- *-*-cygwin* | *-*-pw32* | *-*-beos*)
|
|
- # These systems don't actually have a C or math library (as such)
|
|
+ if test "$arg" = "-lc"; then
|
|
+ case "$host" in
|
|
+ *-*-openbsd*)
|
|
+ # Do not include libc due to us having libc/libc_r.
|
|
continue
|
|
;;
|
|
- *-*-mingw* | *-*-os2*)
|
|
- # These systems don't actually have a C library (as such)
|
|
- test "X$arg" = "X-lc" && continue
|
|
+ esac
|
|
+ elif test "$arg" = "-lc_r"; then
|
|
+ case "$host" in
|
|
+ *-*-openbsd*)
|
|
+ # Do not include libc_r directly, use -pthread flag.
|
|
+ continue
|
|
;;
|
|
*-*-openbsd* | *-*-freebsd*)
|
|
# Do not include libc due to us having libc/libc_r.
|
|
@@ -1078,6 +1081,17 @@ compiler."
|
|
continue
|
|
;;
|
|
|
|
+ -pthread)
|
|
+ case $host in
|
|
+ *-*-openbsd*)
|
|
+ deplibs="$deplibs $arg"
|
|
+ ;;
|
|
+ *)
|
|
+ continue
|
|
+ ;;
|
|
+ esac
|
|
+ ;;
|
|
+
|
|
-module)
|
|
module=yes
|
|
continue
|
|
@@ -1765,7 +1779,6 @@ compiler."
|
|
|
|
if test "$installed" = no; then
|
|
notinst_deplibs="$notinst_deplibs $lib"
|
|
- need_relink=yes
|
|
fi
|
|
|
|
if test -n "$old_archive_from_expsyms_cmds"; then
|
|
@@ -2472,6 +2485,9 @@ compiler."
|
|
# Rhapsody C library is in the System framework
|
|
deplibs="$deplibs -framework System"
|
|
;;
|
|
+ *-*-openbsd*)
|
|
+ # Do not include libc due to us having libc/libc_r.
|
|
+ ;;
|
|
*-*-netbsd*)
|
|
# Don't link with libc until the a.out ld.so is fixed.
|
|
;;
|
|
@@ -4531,40 +4547,6 @@ relink_command=\"$relink_command\""
|
|
# Exit here if they wanted silent mode.
|
|
test "$show" = ":" && exit 0
|
|
|
|
- echo "----------------------------------------------------------------------"
|
|
- echo "Libraries have been installed in:"
|
|
- for libdir in $libdirs; do
|
|
- echo " $libdir"
|
|
- done
|
|
- echo
|
|
- echo "If you ever happen to want to link against installed libraries"
|
|
- echo "in a given directory, LIBDIR, you must either use libtool, and"
|
|
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
|
- echo "flag during linking and do at least one of the following:"
|
|
- if test -n "$shlibpath_var"; then
|
|
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
|
- echo " during execution"
|
|
- fi
|
|
- if test -n "$runpath_var"; then
|
|
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
|
- echo " during linking"
|
|
- fi
|
|
- if test -n "$hardcode_libdir_flag_spec"; then
|
|
- libdir=LIBDIR
|
|
- eval flag=\"$hardcode_libdir_flag_spec\"
|
|
-
|
|
- echo " - use the \`$flag' linker flag"
|
|
- fi
|
|
- if test -n "$admincmds"; then
|
|
- echo " - have your system administrator run these commands:$admincmds"
|
|
- fi
|
|
- if test -f /etc/ld.so.conf; then
|
|
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
|
- fi
|
|
- echo
|
|
- echo "See any operating system documentation about shared libraries for"
|
|
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
|
- echo "----------------------------------------------------------------------"
|
|
exit 0
|
|
;;
|
|
|