Skip to content

Commit da3da02

Browse files
committed
Merge remote-tracking branch 'origin/pr/1265' into dn-cygwin-bootstrap-ci
2 parents 974bc99 + 0d28787 commit da3da02

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

scripts/bootstrap/bootstrap-haskell

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,20 @@ set_msys2_env_dir() {
8080
}
8181

8282
case "${plat}" in
83-
MSYS*|MINGW*|CYGWIN*)
83+
MSYS*|MINGW*)
8484
: "${GHCUP_INSTALL_BASE_PREFIX:=/c}"
8585
GHCUP_DIR=$(cygpath -u "${GHCUP_INSTALL_BASE_PREFIX}/ghcup")
8686
GHCUP_BIN=$(cygpath -u "${GHCUP_INSTALL_BASE_PREFIX}/ghcup/bin")
8787
: "${GHCUP_MSYS2:=${GHCUP_DIR}/msys64}"
8888
set_msys2_env_dir
8989
;;
90+
CYGWIN*)
91+
: "${GHCUP_INSTALL_BASE_PREFIX:=/cygdrive/c}"
92+
GHCUP_DIR=$(cygpath -u "${GHCUP_INSTALL_BASE_PREFIX}/ghcup")
93+
GHCUP_BIN=$(cygpath -u "${GHCUP_INSTALL_BASE_PREFIX}/ghcup/bin")
94+
: "${GHCUP_MSYS2:=${GHCUP_DIR}/msys64}"
95+
set_msys2_env_dir
96+
;;
9097
*)
9198
: "${GHCUP_INSTALL_BASE_PREFIX:=$HOME}"
9299

0 commit comments

Comments
 (0)