libtool: Fix support for NIOS2 processor

When building for a nios2 system, the $host tuple starts with "nios2-"
which is caught by the some of the greedy checks for OS/2 in libtool.
In particular, the *os2* branches of switch statements that only want
to match the OS setting end up matching all nios2 targets, which
results in incorrect behavior.

Switch to use $host_os instead of $host and tweak the patterns to
match to avoid this problem for nios2.

* build-aux/ltmain.in: Switch some $host checks to $host_os.

diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index 9f4889f4232a47c4a12d529aab744242b2761d7f..830b39827f78e33545a7a00202e0fd1a61211591 100644 (file)
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -518,10 +518,10 @@ libtool_validate_options ()
     # preserve --debug
     test : = "$debug_cmd" || func_append preserve_args " --debug"
 
-    case $host in
+    case $host_os in
       # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
       # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
-      *cygwin* | *mingw* | *windows* | *pw32* | *cegcc* | *solaris2* | *os2*)
+      cygwin* | mingw* | windows* | pw32* | cegcc* | solaris2* | os2*)
         # don't eliminate duplications in $postdeps and $predeps
         opt_duplicate_compiler_generated_deps=:
         ;;
@@ -6276,8 +6276,8 @@ func_mode_link ()
        fi
        if test -n "$library_names" &&
           { test no = "$use_static_libs" || test -z "$old_library"; }; then
-         case $host in
-         *cygwin* | *mingw* | *windows* | *cegcc* | *os2*)
+         case $host_os in
+         cygwin* | mingw* | windows* | cegcc* | os2*)
              # No point in relinking DLLs because paths are not encoded
              func_append notinst_deplibs " $lib"
              need_relink=no
@@ -6346,8 +6346,8 @@ func_mode_link ()
              soname=$dlname
            elif test -n "$soname_spec"; then
              # bleh windows
-             case $host in
-             *cygwin* | mingw* | *windows* | *cegcc* | *os2*)
+             case $host_os in
+             cygwin* | mingw* | windows* | cegcc* | os2*)
                func_arith $current - $age
                major=$func_arith_result
                versuffix=-$major