]> git.ipfire.org Git - thirdparty/libtool.git/commitdiff
ltmain: Fix testsuite errors for windows
authorIleana Dumitrescu <ileanadumitrescu95@gmail.com>
Mon, 17 Jun 2024 13:13:07 +0000 (16:13 +0300)
committerIleana Dumitrescu <ileanadumitrescu95@gmail.com>
Tue, 18 Jun 2024 17:37:17 +0000 (20:37 +0300)
Numerous test failures on windows/cygwin/mingw result with:
did not find the 'nothing' variable

A syntax fix resolves these test failures for 64-bit windows-
based systems.

* build-aux/ltmain.in: Alter syntax in sed command.

build-aux/ltmain.in

index abb7b0c70d45e0c2d98ef0fe71f0f6c37d278b06..991228ae996c95e9d4da734178cef7982e0f2478 100644 (file)
@@ -2813,8 +2813,16 @@ extern \"C\" {
                    eval '$ECHO ": $name " >> "$nlist"'
                  fi
                  func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-                 eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
-                   $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+                 case $host in
+                   i[3456]86-*-mingw32*)
+                     eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+                       $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+                   ;;
+                   *)
+                     eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+                       $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/__nm_//' >> '$nlist'"
+                   ;;
+                 esac
                }
              else # not an import lib
                $opt_dry_run || {