From: Bruno Haible <bruno@clisp.org>
Date: Mon, 3 Feb 2025 22:18:16 +0000 (-0800)
Subject: compile: Improve support for C++ compilations on MSYS2.
X-Git-Tag: v1.17.90~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fbc3f90d1bfdc68a3d12f3d08acde70e53befee;p=thirdparty%2Fautomake.git

compile: Improve support for C++ compilations on MSYS2.

* lib/compile (func_file_conv): Use 'cygpath -w', not 'cygpath -m'
(c:\... vs. c:/... resp.).
* lib/ar-lib (func_file_conv): Likewise.
---

diff --git a/lib/ar-lib b/lib/ar-lib
index f85f879d8..d0a7b5c8a 100755
--- a/lib/ar-lib
+++ b/lib/ar-lib
@@ -77,7 +77,7 @@ func_file_conv ()
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
 	cygwin)
-	  file=`cygpath -m "$file" || echo "$file"`
+	  file=`cygpath -w "$file" || echo "$file"`
 	  ;;
 	wine)
 	  file=`winepath -w "$file" || echo "$file"`
diff --git a/lib/compile b/lib/compile
index fc738d3d9..c404e89e4 100755
--- a/lib/compile
+++ b/lib/compile
@@ -81,7 +81,7 @@ func_file_conv ()
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
 	cygwin/*)
-	  file=`cygpath -m "$file" || echo "$file"`
+	  file=`cygpath -w "$file" || echo "$file"`
 	  ;;
 	wine/*)
 	  file=`winepath -w "$file" || echo "$file"`