From: Kirill Makurin <maiddaisuki@outlook.com>
Date: Fri, 2 Jan 2026 18:22:57 +0000 (+0200)
Subject: ltmain.in: Fix file path conversions for MSYS2 and MSVC
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97998eb82af095abc1dfff68281cc045b4f1cc9a;p=thirdparty%2Flibtool.git

ltmain.in: Fix file path conversions for MSYS2 and MSVC

The result of cygpath file path conversions are not stored correctly
causing the path conversions to fail on MSYS2 and MSVC.

Reported: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=79468

* build-aux/ltmain.in: Replace func_convert_core_msys_to_w32_result
  with func_convert_core_msys_to_w32_with_cygpath_result.
* NEWS: Update.
---

diff --git a/NEWS b/NEWS
index da461a5c8..4b1ecc2d3 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ NEWS - list of user-visible changes between releases of GNU Libtool
 
 ** Bug fixes:
 
+  - Store cygpath file path conversions correctly for MSYS2 and MSVC.
+
   - Fix syntax error in LT_PROG_OBJC and LT_PROG_OBJCXX.
 
   - Separate Objective C and C++ cache check for proper tagging support.
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index 27e18c57e..685939721 100644
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -1054,11 +1054,11 @@ func_convert_core_msys_to_w32_with_cygpath ()
 
   # Since MSYS2 is packaged with cygpath, call cygpath in $PATH; no need
   # to use LT_CYGPATH in this case.
-  func_convert_core_msys_to_w32_result=`cygpath "$@" 2>/dev/null |
+  func_convert_core_msys_to_w32_with_cygpath_result=`cygpath "$@" 2>/dev/null |
 	$SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
   if test "$?" -ne 0; then
       # on failure, ensure result is empty
-      func_convert_core_msys_to_w32_result=
+      func_convert_core_msys_to_w32_with_cygpath_result=
   fi
 }
 #end: func_convert_core_msys_to_w32_with_cygpath