summaryrefslogtreecommitdiffstats
path: root/ltmain.sh
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2000-09-30 06:02:57 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2000-09-30 06:02:57 +0000
commit3dd7094e20b214a71ed62f8044abe090b4c53b45 (patch)
tree39fdddf620fcd00b70b8c3340dbb14ac59892d80 /ltmain.sh
parentcse.c (notreg_cost): New argument outer. (diff)
downloadgcc-3dd7094e20b214a71ed62f8044abe090b4c53b45.tar.gz
gcc-3dd7094e20b214a71ed62f8044abe090b4c53b45.tar.bz2
gcc-3dd7094e20b214a71ed62f8044abe090b4c53b45.tar.xz
ltconfig, [...]: Updated from libtool multi-language branch, to work around Solaris' /bin/sh bug.
* ltconfig, ltmain.sh, libtool.m4, ltcf-cxx.sh: Updated from libtool multi-language branch, to work around Solaris' /bin/sh bug. Rebuilt all affected `configure' scripts. From-SVN: r36672
Diffstat (limited to 'ltmain.sh')
-rw-r--r--ltmain.sh28
1 files changed, 14 insertions, 14 deletions
diff --git a/ltmain.sh b/ltmain.sh
index 1ce0a5d8e61..554c82a1d95 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -55,7 +55,7 @@ modename="$progname"
55PROGRAM=ltmain.sh 55PROGRAM=ltmain.sh
56PACKAGE=libtool 56PACKAGE=libtool
57VERSION=1.4a 57VERSION=1.4a
58TIMESTAMP=" (1.641.2.111 2000/09/05 10:29:18)" 58TIMESTAMP=" (1.641.2.122 2000/09/30 05:27:52)"
59 59
60default_mode= 60default_mode=
61help="Try \`$progname --help' for more information." 61help="Try \`$progname --help' for more information."
@@ -545,7 +545,7 @@ if test -z "$show_help"; then
545 545
546 # On Cygwin there's no "real" PIC flag so we must build both object types 546 # On Cygwin there's no "real" PIC flag so we must build both object types
547 case "$host_os" in 547 case "$host_os" in
548 cygwin* | mingw* | os2*) 548 cygwin* | mingw* | pw32* | os2*)
549 pic_mode=default 549 pic_mode=default
550 ;; 550 ;;
551 esac 551 esac
@@ -557,7 +557,7 @@ if test -z "$show_help"; then
557 # Calculate the filename of the output object if compiler does 557 # Calculate the filename of the output object if compiler does
558 # not support -o with -c 558 # not support -o with -c
559 if test "$compiler_c_o" = no; then 559 if test "$compiler_c_o" = no; then
560 output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\..*$%%'`.${objext} 560 output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
561 lockfile="$output_obj.lock" 561 lockfile="$output_obj.lock"
562 removelist="$removelist $output_obj $lockfile" 562 removelist="$removelist $output_obj $lockfile"
563 trap "$run $rm $removelist; exit 1" 1 2 15 563 trap "$run $rm $removelist; exit 1" 1 2 15
@@ -778,7 +778,7 @@ EOF
778 link | relink) 778 link | relink)
779 modename="$modename: link" 779 modename="$modename: link"
780 case "$host" in 780 case "$host" in
781 *-*-cygwin* | *-*-mingw* | *-*-os2*) 781 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
782 # It is impossible to link a dll without this setting, and 782 # It is impossible to link a dll without this setting, and
783 # we shouldn't force the makefile maintainer to figure out 783 # we shouldn't force the makefile maintainer to figure out
784 # which system we are compiling for in order to pass an extra 784 # which system we are compiling for in order to pass an extra
@@ -1080,7 +1080,7 @@ EOF
1080 ;; 1080 ;;
1081 esac 1081 esac
1082 case "$host" in 1082 case "$host" in
1083 *-*-cygwin* | *-*-mingw* | *-*-os2*) 1083 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
1084 case ":$dllsearchpath:" in 1084 case ":$dllsearchpath:" in
1085 *":$dir:"*) ;; 1085 *":$dir:"*) ;;
1086 *) dllsearchpath="$dllsearchpath:$dir";; 1086 *) dllsearchpath="$dllsearchpath:$dir";;
@@ -1093,14 +1093,14 @@ EOF
1093 -l*) 1093 -l*)
1094 if test "$arg" = "-lc"; then 1094 if test "$arg" = "-lc"; then
1095 case "$host" in 1095 case "$host" in
1096 *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) 1096 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
1097 # These systems don't actually have c library (as such) 1097 # These systems don't actually have c library (as such)
1098 continue 1098 continue
1099 ;; 1099 ;;
1100 esac 1100 esac
1101 elif test "$arg" = "-lm"; then 1101 elif test "$arg" = "-lm"; then
1102 case "$host" in 1102 case "$host" in
1103 *-*-cygwin* | *-*-beos*) 1103 *-*-cygwin* | *-*-pw32* | *-*-beos*)
1104 # These systems don't actually have math library (as such) 1104 # These systems don't actually have math library (as such)
1105 continue 1105 continue
1106 ;; 1106 ;;
@@ -1122,7 +1122,7 @@ EOF
1122 1122
1123 -no-install) 1123 -no-install)
1124 case "$host" in 1124 case "$host" in
1125 *-*-cygwin* | *-*-mingw* | *-*-os2*) 1125 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
1126 # The PATH hackery in wrapper scripts is required on Windows 1126 # The PATH hackery in wrapper scripts is required on Windows
1127 # in order for the loader to find any dlls it needs. 1127 # in order for the loader to find any dlls it needs.
1128 $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 1128 $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
@@ -2481,10 +2481,10 @@ EOF
2481 ;; 2481 ;;
2482 2482
2483 windows) 2483 windows)
2484 # Like Linux, but with '-' rather than '.', since we only 2484 # Use '-' rather than '.', since we only want one
2485 # want one extension on Windows 95. 2485 # extension on DOS 8.3 filesystems.
2486 major=`expr $current - $age` 2486 major=`expr $current - $age`
2487 versuffix="-$major-$age-$revision" 2487 versuffix="-$major"
2488 ;; 2488 ;;
2489 2489
2490 *) 2490 *)
@@ -2599,7 +2599,7 @@ EOF
2599 if test "$build_libtool_libs" = yes; then 2599 if test "$build_libtool_libs" = yes; then
2600 if test -n "$rpath"; then 2600 if test -n "$rpath"; then
2601 case "$host" in 2601 case "$host" in
2602 *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) 2602 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
2603 # these systems don't actually have a c library (as such)! 2603 # these systems don't actually have a c library (as such)!
2604 ;; 2604 ;;
2605 *) 2605 *)
@@ -3251,7 +3251,7 @@ EOF
3251 esac 3251 esac
3252 fi 3252 fi
3253 case "$host" in 3253 case "$host" in
3254 *-*-cygwin* | *-*-mingw* | *-*-os2*) 3254 *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
3255 case ":$dllsearchpath:" in 3255 case ":$dllsearchpath:" in
3256 *":$libdir:"*) ;; 3256 *":$libdir:"*) ;;
3257 *) dllsearchpath="$dllsearchpath:$libdir";; 3257 *) dllsearchpath="$dllsearchpath:$libdir";;
@@ -3785,7 +3785,7 @@ else
3785 case $host in 3785 case $host in
3786 # win32 systems need to use the prog path for dll 3786 # win32 systems need to use the prog path for dll
3787 # lookup to work 3787 # lookup to work
3788 *-*-cygwin*) 3788 *-*-cygwin* | *-*-pw32*)
3789 $echo >> $output "\ 3789 $echo >> $output "\
3790 exec \$progdir/\$program \${1+\"\$@\"} 3790 exec \$progdir/\$program \${1+\"\$@\"}
3791" 3791"