Merge pull request #10380 from dra27/cygpath-locale

Fix configure on Windows with non C-locale characters

(cherry picked from commit da44d603ab37070bd1d8611889c26674b1e88c67)

7 files changed, 12 insertions, 9 deletions

diff --git a/Changes b/Changes
index 162f255f4e..9967d46298 100644
--- a/Changes
+++ b/Changes
@@ -565,6 +565,9 @@ OCaml 4.13.0
 - #10376: Link runtime libraries correctly on msvc64 in -output-complete-obj
   (David Allsopp, review by Gabriel Scherer)
 
+- #10380: Correct handling of UTF-8 paths in configure on Windows
+  (David Allsopp, review by Sébastien Hinderer)
+
 - #10449: Fix major GC work accounting (the GC was running too fast).
   (Damien Doligez, report by Stephen Dolan, review by Nicolás Ojeda Bär and
    Sadiq Jaffer)
diff --git a/README.win32.adoc b/README.win32.adoc
index d97aaeb0a3..bfd1d0cde5 100644
--- a/README.win32.adoc
+++ b/README.win32.adoc
@@ -201,7 +201,7 @@ Now run:
 
 for 32-bit, or:
 
-        ./configure --build=x86_64-unknown-cygwin --host=x86_64-pc-windows
+        ./configure --build=x86_64-pc-cygwin --host=x86_64-pc-windows
 
 for 64-bit.
 
@@ -266,7 +266,7 @@ Now run:
 
 for 32-bit, or:
 
-        ./configure --build=x86_64-unknown-cygwin --host=x86_64-w64-mingw32
+        ./configure --build=x86_64-pc-cygwin --host=x86_64-w64-mingw32
 
 for 64-bit.
 
diff --git a/configure b/configure
index a663e88897..6ebe0095d2 100755
--- a/configure
+++ b/configure
@@ -17767,7 +17767,7 @@ else
           && test "$host_vendor-$host_os" != "$build_vendor-$build_os" ; then :
   case $build in #(
   *-pc-cygwin) :
-    prefix=`cygpath -m "$prefix"` ;; #(
+    prefix="$(LC_ALL=C.UTF-8 cygpath -m "$prefix")" ;; #(
   *) :
      ;;
 esac
diff --git a/configure.ac b/configure.ac
index 871d5a55dc..9237f65c97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1977,7 +1977,7 @@ AS_IF([test x"$prefix" = "xNONE"],
   [AS_IF([test x"$unix_or_win32" = "xwin32" \
           && test "$host_vendor-$host_os" != "$build_vendor-$build_os" ],
     [AS_CASE([$build],
-      [*-pc-cygwin], [prefix=`cygpath -m "$prefix"`])])])
+      [*-pc-cygwin], [prefix="$(LC_ALL=C.UTF-8 cygpath -m "$prefix")"])])])
 
 # Define a few macros that were defined in config/m-nt.h
 # but whose value is not guessed properly by configure
diff --git a/tools/ci/appveyor/appveyor_build.sh b/tools/ci/appveyor/appveyor_build.sh
index f5165863d2..fa43cd3ae3 100644
--- a/tools/ci/appveyor/appveyor_build.sh
+++ b/tools/ci/appveyor/appveyor_build.sh
@@ -70,7 +70,7 @@ function set_configuration {
             dep='--disable-dependency-generation'
         ;;
         msvc64)
-            build='--build=x86_64-unknown-cygwin'
+            build='--build=x86_64-pc-cygwin'
             host='--host=x86_64-pc-windows'
             # Explicitly test dependency generation on msvc64
             dep='--enable-dependency-generation'
diff --git a/tools/ci/inria/bootstrap/script b/tools/ci/inria/bootstrap/script
index 8233ab7b71..607c6cdbd9 100755
--- a/tools/ci/inria/bootstrap/script
+++ b/tools/ci/inria/bootstrap/script
@@ -158,7 +158,7 @@ case "${OCAML_ARCH}" in
     check_make_alldepend=true
   ;;
   mingw64)
-    build='--build=x86_64-unknown-cygwin'
+    build='--build=x86_64-pc-cygwin'
     host='--host=x86_64-w64-mingw32'
     instdir='C:/ocamlmgw64'
     cleanup=true
@@ -172,7 +172,7 @@ case "${OCAML_ARCH}" in
     cleanup=true
   ;;
   msvc64)
-    build='--build=x86_64-unknown-cygwin'
+    build='--build=x86_64-pc-cygwin'
     host='--host=x86_64-pc-windows'
     instdir='C:/ocamlms64'
     configure=nt
diff --git a/tools/ci/inria/main b/tools/ci/inria/main
index ef83e88ad0..188d1e8be6 100755
--- a/tools/ci/inria/main
+++ b/tools/ci/inria/main
@@ -157,7 +157,7 @@ case "${OCAML_ARCH}" in
     check_make_alldepend=true
   ;;
   mingw64)
-    build='--build=x86_64-unknown-cygwin'
+    build='--build=x86_64-pc-cygwin'
     host='--host=x86_64-w64-mingw32'
     instdir='C:/ocamlmgw64'
     cleanup=true
@@ -170,7 +170,7 @@ case "${OCAML_ARCH}" in
     cleanup=true
   ;;
   msvc64)
-    build='--build=x86_64-unknown-cygwin'
+    build='--build=x86_64-pc-cygwin'
     host='--host=x86_64-pc-windows'
     instdir='C:/ocamlms64'
     cleanup=true