build-scripts/ltmain.sh
changeset 1611 ec3466b08f17
parent 1570 a740bca2a1b1
child 1659 14717b52abc0
     1.1 --- a/build-scripts/ltmain.sh	Fri Mar 24 03:49:37 2006 +0000
     1.2 +++ b/build-scripts/ltmain.sh	Fri Mar 24 05:11:51 2006 +0000
     1.3 @@ -1413,19 +1413,6 @@
     1.4  	  finalize_command="$finalize_command $qarg"
     1.5  	  continue
     1.6  	  ;;
     1.7 -	framework)
     1.8 -	  case $host in
     1.9 -	    *-*-darwin*)
    1.10 -	      case "$deplibs " in
    1.11 -	        *" $qarg.framework "*) ;;
    1.12 -		*) deplibs="$deplibs $qarg.framework" # this is fixed later
    1.13 -		   ;;
    1.14 -              esac
    1.15 -              ;;
    1.16 -   	  esac
    1.17 - 	  prev=
    1.18 - 	  continue
    1.19 - 	  ;;
    1.20  	shrext)
    1.21    	  shrext_cmds="$arg"
    1.22  	  prev=
    1.23 @@ -1802,11 +1789,6 @@
    1.24  	continue
    1.25  	;;
    1.26  
    1.27 -      -framework)
    1.28 -        prev=framework
    1.29 -	continue
    1.30 -	;;
    1.31 -
    1.32        # Some other compiler flag.
    1.33        -* | +*)
    1.34  	# Unknown arguments in both finalize_command and compile_command need
    1.35 @@ -2190,18 +2172,6 @@
    1.36  	    fi
    1.37  	  fi
    1.38  	  ;; # -l
    1.39 -	*.framework)
    1.40 -	  if test "$linkmode,$pass" = "prog,link"; then
    1.41 -	    compile_deplibs="$deplib $compile_deplibs"
    1.42 -	    finalize_deplibs="$deplib $finalize_deplibs"
    1.43 -	  else
    1.44 -	    deplibs="$deplib $deplibs"
    1.45 -	    if test "$linkmode" = lib ; then
    1.46 -	      newdependency_libs="$deplib $newdependency_libs"
    1.47 -	    fi
    1.48 -	  fi
    1.49 -	  continue
    1.50 -	  ;;
    1.51  	-L*)
    1.52  	  case $linkmode in
    1.53  	  lib)
    1.54 @@ -2347,13 +2317,6 @@
    1.55  	*) . ./$lib ;;
    1.56  	esac
    1.57  
    1.58 -	case $host in
    1.59 -	*-*-darwin*)
    1.60 -	  # Convert "-framework foo" to "foo.framework" in dependency_libs
    1.61 -	  test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.framework/g'`
    1.62 -	  ;;
    1.63 -	esac
    1.64 -
    1.65  	if test "$linkmode,$pass" = "lib,link" ||
    1.66  	   test "$linkmode,$pass" = "prog,scan" ||
    1.67  	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
    1.68 @@ -2974,13 +2937,6 @@
    1.69  		  done
    1.70  		  path=""
    1.71  		  ;;
    1.72 -	      *.framework)
    1.73 -		case $host in
    1.74 -		  *-*-darwin*)
    1.75 -		    depdepl="$deplib"
    1.76 -		    ;;
    1.77 -		esac
    1.78 -		;;
    1.79  		*) continue ;;
    1.80  		esac
    1.81  		;;
    1.82 @@ -3848,13 +3804,6 @@
    1.83  	    fi
    1.84  	  fi
    1.85  	fi
    1.86 -	# Time to change all our "foo.framework" stuff back to "-framework foo"
    1.87 -	case $host in
    1.88 -	  *-*-darwin*)
    1.89 -	    newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).framework% -framework \1%g'`
    1.90 -	    dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).framework%%g'`
    1.91 -	    ;;
    1.92 -	esac
    1.93  	# Done checking deplibs!
    1.94  	deplibs=$newdeplibs
    1.95        fi
    1.96 @@ -4394,15 +4343,12 @@
    1.97        esac
    1.98  
    1.99        case $host in
   1.100 -      *-*-darwin*)
   1.101 +      *darwin*)
   1.102          # Don't allow lazy linking, it breaks C++ global constructors
   1.103          if test "$tagname" = CXX ; then
   1.104          compile_command="$compile_command ${wl}-bind_at_load"
   1.105          finalize_command="$finalize_command ${wl}-bind_at_load"
   1.106          fi
   1.107 -	# Time to change all our "foo.framework" stuff back to "-framework foo"
   1.108 -	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).framework% -framework \1%g'`
   1.109 -	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).framework% -framework \1%g'`
   1.110          ;;
   1.111        esac
   1.112