Skip to content

Commit 4592162

Browse files
committed
Fix build on windows 9.2.2
1 parent 032f192 commit 4592162

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

.gitlab/ci.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ 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}/mingw/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/usr/bin:$PATH"
52+
ls ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin
53+
cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libgcc_s_seh-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
54+
cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libwinpthread-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
55+
ghc --info
5056
# Shorten binary names
5157
sed -i.bak -e 's/haskell-language-server/hls/g' \
5258
-e 's/haskell_language_server/hls/g' \

.gitlab/test.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,18 @@ 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}/mingw/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/usr/bin:$PATH"
52+
ls ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin
53+
cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libgcc_s_seh-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
54+
cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libwinpthread-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
55+
ghc --info
56+
;;
57+
*) ;;
58+
esac
59+
4860
# make sure out/ dir is gone, so build host rpaths don't
4961
# kick in (TODO: we should probably remove those)
5062
mv "$CI_PROJECT_DIR/out"/*.tar.xz .

0 commit comments

Comments
 (0)