From 5b652b84ed6b44f3904ce7142bd9fd741ba4ba96 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 7 Oct 2024 20:14:04 +0200 Subject: [PATCH] csharpexec-script: Improve Cygwin support. * build-aux/csharpexec.sh.in: Convert the first 'clix' argument to native Windows syntax. --- ChangeLog | 6 ++++++ build-aux/csharpexec.sh.in | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 152ace80c4..2d12dd3edf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-10-07 Bruno Haible + + csharpexec-script: Improve Cygwin support. + * build-aux/csharpexec.sh.in: Convert the first 'clix' argument to + native Windows syntax. + 2024-10-07 Bruno Haible cygpath: New module. diff --git a/build-aux/csharpexec.sh.in b/build-aux/csharpexec.sh.in index 2ef677c10a..83d60ca870 100644 --- a/build-aux/csharpexec.sh.in +++ b/build-aux/csharpexec.sh.in @@ -79,8 +79,16 @@ else @CLIX_PATH_VAR@="$CONF_CLIX_PATH" fi export @CLIX_PATH_VAR@ - test -z "$CSHARP_VERBOSE" || echo clix "$@" - exec clix "$@" + shift + # On Windows, assume that 'clix' is a native Windows program, + # not a Cygwin program. + case "@build_os@" in + cygwin*) + prog=`cygpath -w "$prog"` + ;; + esac + test -z "$CSHARP_VERBOSE" || echo clix "$prog" "$@" + exec clix "$prog" "$@" else echo 'C# virtual machine not found, try installing mono, then reconfigure' 1>&2 exit 1 -- 2.39.5