--- a/ltmain.sh 2009-11-16 06:23:18.000000000 -0700
+++ b/ltmain.sh 2010-09-18 20:25:06.000000000 -0700
@@ -1048,8 +1048,8 @@ func_infer_tag ()
# was found and let the user know that the "--tag" command
# line option must be used.
if test -z "$tagname"; then
- func_echo "unable to infer tagged configuration"
- func_fatal_error "specify a tag with \`--tag'"
+ func_echo "defaulting to \`CC'"
+ func_echo "if this is not correct, specify a tag with \`--tag'"
# func_verbose "using $tagname tagged configuration"
@@ -2018,8 +2018,11 @@ func_mode_install ()
# At present, this check doesn't affect windows .dll's that
# are installed into $libdir/../bin (currently, that works fine)
# but it's something to keep an eye on.
- test "$inst_prefix_dir" = "$destdir" && \
- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+ # This breaks install into our staging area. -PB
+ # test "$inst_prefix_dir" = "$destdir" && \
+ # func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -5412,8 +5415,14 @@ func_mode_link ()
+ # Adding 'libdir' from the .la file to our library search paths
+ # breaks crosscompilation horribly. We cheat here and don't add
+ # it, instead adding the path where we found the .la. -CL
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
@@ -5564,7 +5573,7 @@ func_mode_link ()
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
@@ -8052,6 +8061,10 @@ EOF
# Replace all uninstalled libtool libraries with the installed ones
for deplib in $dependency_libs; do
+ # Replacing uninstalled with installed can easily break crosscompilation,
+ # since the installed path is generally the wrong architecture. -CL
+ newdependency_libs="$newdependency_libs $deplib"