From 0d28787d86fc1b7c50bbe4e2970db4f0db229288 Mon Sep 17 00:00:00 2001 From: Ira Peach Date: Wed, 21 May 2025 22:44:10 -0500 Subject: [PATCH] Use /cygdrive path prefix for bootstrap-haskell. --- scripts/bootstrap/bootstrap-haskell | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap/bootstrap-haskell b/scripts/bootstrap/bootstrap-haskell index e55efaeb..971fcf83 100755 --- a/scripts/bootstrap/bootstrap-haskell +++ b/scripts/bootstrap/bootstrap-haskell @@ -80,13 +80,20 @@ set_msys2_env_dir() { } case "${plat}" in - MSYS*|MINGW*|CYGWIN*) + MSYS*|MINGW*) : "${GHCUP_INSTALL_BASE_PREFIX:=/c}" GHCUP_DIR=$(cygpath -u "${GHCUP_INSTALL_BASE_PREFIX}/ghcup") GHCUP_BIN=$(cygpath -u "${GHCUP_INSTALL_BASE_PREFIX}/ghcup/bin") : "${GHCUP_MSYS2:=${GHCUP_DIR}/msys64}" set_msys2_env_dir ;; + CYGWIN*) + : "${GHCUP_INSTALL_BASE_PREFIX:=/cygdrive/c}" + GHCUP_DIR=$(cygpath -u "${GHCUP_INSTALL_BASE_PREFIX}/ghcup") + GHCUP_BIN=$(cygpath -u "${GHCUP_INSTALL_BASE_PREFIX}/ghcup/bin") + : "${GHCUP_MSYS2:=${GHCUP_DIR}/msys64}" + set_msys2_env_dir + ;; *) : "${GHCUP_INSTALL_BASE_PREFIX:=$HOME}"