1*4882a593Smuzhiyun--- a/ltmain.sh 2014-07-30 22:21:24.664684143 +0200 2*4882a593Smuzhiyun+++ b/ltmain.sh 2014-07-30 22:23:02.440687625 +0200 3*4882a593Smuzhiyun@@ -1417,8 +1417,8 @@ 4*4882a593Smuzhiyun # was found and let the user know that the "--tag" command 5*4882a593Smuzhiyun # line option must be used. 6*4882a593Smuzhiyun if test -z "$tagname"; then 7*4882a593Smuzhiyun- func_echo "unable to infer tagged configuration" 8*4882a593Smuzhiyun- func_fatal_error "specify a tag with \`--tag'" 9*4882a593Smuzhiyun+ func_echo "defaulting to \`CC'" 10*4882a593Smuzhiyun+ func_echo "if this is not correct, specify a tag with \`--tag'" 11*4882a593Smuzhiyun # else 12*4882a593Smuzhiyun # func_verbose "using $tagname tagged configuration" 13*4882a593Smuzhiyun fi 14*4882a593Smuzhiyun@@ -2963,8 +2963,11 @@ 15*4882a593Smuzhiyun # At present, this check doesn't affect windows .dll's that 16*4882a593Smuzhiyun # are installed into $libdir/../bin (currently, that works fine) 17*4882a593Smuzhiyun # but it's something to keep an eye on. 18*4882a593Smuzhiyun- test "$inst_prefix_dir" = "$destdir" && \ 19*4882a593Smuzhiyun- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" 20*4882a593Smuzhiyun+ # 21*4882a593Smuzhiyun+ # This breaks install into our staging area. -PB 22*4882a593Smuzhiyun+ # 23*4882a593Smuzhiyun+ # test "$inst_prefix_dir" = "$destdir" && \ 24*4882a593Smuzhiyun+ # func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun if test -n "$inst_prefix_dir"; then 27*4882a593Smuzhiyun # Stick the inst_prefix_dir data into the link command. 28*4882a593Smuzhiyun@@ -5176,7 +5179,8 @@ 29*4882a593Smuzhiyun ;; 30*4882a593Smuzhiyun -all-static | -static | -static-libtool-libs) 31*4882a593Smuzhiyun case $arg in 32*4882a593Smuzhiyun- -all-static) 33*4882a593Smuzhiyun+ # Make -static behave like -all-static 34*4882a593Smuzhiyun+ -all-static | -static) 35*4882a593Smuzhiyun if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then 36*4882a593Smuzhiyun func_warning "complete static linking is impossible in this configuration" 37*4882a593Smuzhiyun fi 38*4882a593Smuzhiyun@@ -5185,12 +5189,6 @@ 39*4882a593Smuzhiyun fi 40*4882a593Smuzhiyun prefer_static_libs=yes 41*4882a593Smuzhiyun ;; 42*4882a593Smuzhiyun- -static) 43*4882a593Smuzhiyun- if test -z "$pic_flag" && test -n "$link_static_flag"; then 44*4882a593Smuzhiyun- dlopen_self=$dlopen_self_static 45*4882a593Smuzhiyun- fi 46*4882a593Smuzhiyun- prefer_static_libs=built 47*4882a593Smuzhiyun- ;; 48*4882a593Smuzhiyun -static-libtool-libs) 49*4882a593Smuzhiyun if test -z "$pic_flag" && test -n "$link_static_flag"; then 50*4882a593Smuzhiyun dlopen_self=$dlopen_self_static 51*4882a593Smuzhiyun@@ -5473,7 +5471,8 @@ 52*4882a593Smuzhiyun prevarg="$arg" 53*4882a593Smuzhiyun 54*4882a593Smuzhiyun case $arg in 55*4882a593Smuzhiyun- -all-static) 56*4882a593Smuzhiyun+ # Make -static behave like -all-static 57*4882a593Smuzhiyun+ -all-static | -static) 58*4882a593Smuzhiyun if test -n "$link_static_flag"; then 59*4882a593Smuzhiyun # See comment for -static flag below, for more details. 60*4882a593Smuzhiyun func_append compile_command " $link_static_flag" 61*4882a593Smuzhiyun@@ -5754,7 +5753,7 @@ 62*4882a593Smuzhiyun continue 63*4882a593Smuzhiyun ;; 64*4882a593Smuzhiyun 65*4882a593Smuzhiyun- -static | -static-libtool-libs) 66*4882a593Smuzhiyun+ -static-libtool-libs) 67*4882a593Smuzhiyun # The effects of -static are defined in a previous loop. 68*4882a593Smuzhiyun # We used to do the same as -all-static on platforms that 69*4882a593Smuzhiyun # didn't have a PIC flag, but the assumption that the effects 70*4882a593Smuzhiyun@@ -6697,7 +6696,7 @@ 71*4882a593Smuzhiyun *) 72*4882a593Smuzhiyun if test "$installed" = no; then 73*4882a593Smuzhiyun func_append notinst_deplibs " $lib" 74*4882a593Smuzhiyun- need_relink=yes 75*4882a593Smuzhiyun+ need_relink=no 76*4882a593Smuzhiyun fi 77*4882a593Smuzhiyun ;; 78*4882a593Smuzhiyun esac 79*4882a593Smuzhiyun@@ -9275,6 +9274,10 @@ 80*4882a593Smuzhiyun # Replace all uninstalled libtool libraries with the installed ones 81*4882a593Smuzhiyun newdependency_libs= 82*4882a593Smuzhiyun for deplib in $dependency_libs; do 83*4882a593Smuzhiyun+ # Replacing uninstalled with installed can easily break crosscompilation, 84*4882a593Smuzhiyun+ # since the installed path is generally the wrong architecture. -CL 85*4882a593Smuzhiyun+ newdependency_libs="$newdependency_libs $deplib" 86*4882a593Smuzhiyun+ continue 87*4882a593Smuzhiyun case $deplib in 88*4882a593Smuzhiyun *.la) 89*4882a593Smuzhiyun func_basename "$deplib" 90