libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 3/3] libtool: Fix support for NIOS2 processor


From: Richard Purdie
Subject: [PATCH 3/3] libtool: Fix support for NIOS2 processor
Date: Tue, 16 Jan 2024 15:14:24 +0000

The name of the system contains the string "nios2". This string
is caught by the some of the greedy checks for OS/2 in libtool,
in particular the *os2* branches of switch statements match for
the nios2 string, which results in incorrect behavior of libtool.

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

* build-aux/ltmain.in: Fix NIOS2 support
---
 build-aux/ltmain.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index cf6dc13a..ac11b7ae 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -517,10 +517,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=:
         ;;
@@ -6279,8 +6279,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
@@ -6349,8 +6349,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
-- 
2.39.2




reply via email to

[Prev in Thread] Current Thread [Next in Thread]