branch: development
commit c0b1a53aac64372a0af50ce288201bd321aa1e44
Author: Ileana Dumitrescu <ileanadumitresc...@gmail.com>
AuthorDate: Mon Jun 17 16:13:07 2024 +0300
ltmain: Fix testsuite errors for windows
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 | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index abb7b0c7..991228ae 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -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 || {
