Skip to content

Commit 7e1c11e

Browse files
committed
Fix build on windows 9.2.2
1 parent 505c102 commit 7e1c11e

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

.gitlab/ci.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ esac
4747

4848
case "$(uname)" in
4949
MSYS_*|MINGW*)
50+
# workaround for https://gitlab.haskell.org/ghc/ghc/-/issues/21196
51+
export PATH="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw64/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw64/usr/bin:$PATH"
5052
# Shorten binary names
5153
sed -i.bak -e 's/haskell-language-server/hls/g' \
5254
-e 's/haskell_language_server/hls/g' \

.gitlab/test.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,14 @@ case "$(uname -s)" in
4545
;;
4646
esac
4747

48+
case "$(uname)" in
49+
MSYS_*|MINGW*)
50+
# workaround for https://gitlab.haskell.org/ghc/ghc/-/issues/21196
51+
export PATH="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw64/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw64/usr/bin:$PATH"
52+
;;
53+
*) ;;
54+
esac
55+
4856
# make sure out/ dir is gone, so build host rpaths don't
4957
# kick in (TODO: we should probably remove those)
5058
mv "$CI_PROJECT_DIR/out"/*.tar.xz .

0 commit comments

Comments
 (0)