Skip to content

Commit f021db6

Browse files
authored
Fix static linking on Windows (#403)
* Fix static linking on Windows (https://gitlab.haskell.org/ghc/ghc/-/issues/20878) * Upgrade GHC version in Windows build
1 parent 88d0241 commit f021db6

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

.github/workflows/windows_and_macOS.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
os: ['windows-latest', 'macOS-latest']
16-
ghc: ['8.10.5']
16+
ghc: ['latest']
1717
fail-fast: false
1818
steps:
1919
- uses: actions/checkout@v2

text.cabal

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,7 @@ library
9090
cbits/validate_utf8.cpp
9191
cxx-options: -std=c++17
9292
cpp-options: -DSIMDUTF
93-
if os(windows)
94-
if arch(x86_64)
95-
extra-libraries: stdc++-6 gcc_s_seh-1
96-
else
97-
extra-libraries: stdc++-6 gcc_s_dw2-1
98-
elif os(darwin) || os(freebsd)
93+
if os(darwin) || os(freebsd)
9994
extra-libraries: c++
10095
elif os(openbsd)
10196
extra-libraries: c++ c++abi

0 commit comments

Comments
 (0)