Move Windows build to GHC 9.4 #415
Conversation
elopez
force-pushed
the
windows-9.4
branch
2 times, most recently
from
affc06a
to
35aa4da
Compare
Starting with GHC 9.4, this can be used to reliably link against the system's C++ standard library implementation. GHC 9.4 currently breaks on Windows because 9.4 uses a Clang-based toolchain. * https://gitlab.haskell.org/ghc/ghc/-/wikis/migration/9.4#windows-uses-a-clang-based-toolchain * https://gitlab.haskell.org/ghc/ghc/-/wikis/migration/9.4#link-against-system-cxx-std-lib-instead-of-stdc
Also update the Haskell setup action's name, the old repository is being deprecated.
elopez
force-pushed
the
windows-9.4
branch
5 times, most recently
from
e43f573
to
8fcc575
Compare
GHC 9.4 uses the CLANG64 environment now: https://gitlab.haskell.org/ghc/ghc/-/issues/22561
GHC 9.4 introduces a generic way of linking against the system C++ standard library: https://gitlab.haskell.org/ghc/ghc/-/wikis/migration/9.4#link-against-system-cxx-std-lib-instead-of-stdc Unfortunately it does not properly work on Nix, so we link manually on Darwin to work around the issue: https://gitlab.haskell.org/ghc/ghc/-/issues/23138
The GitHub runner has lots of things preinstalled that tend to cause conflicts. Use the minimal MSYS2 path option and add-in the Haskell tools we need instead.
D:\a\_temp\msys64\clang64\include\stdio.h:171:18: error:
warning: '__format__' attribute argument not supported: gnu_scanf [-Wignored-attributes]
__attribute__((__format__ (gnu_scanf, 2, 0))) __MINGW_ATTRIB_NONNULL(2)
^
|
171 | __attribute__((__format__ (gnu_scanf, 2, 0))) __MINGW_ATTRIB_NONNULL(2)
| ^
hevm.cabal
Outdated
| if os(darwin) | ||
| extra-libraries: c++ |
There was a problem hiding this comment.
Can we move this up so the diff looks smaller?
hevm.cabal
Outdated
| if os(windows) | ||
| buildable: False |
There was a problem hiding this comment.
Can we move this up so the diff looks smaller? Thanks!
hevm.cabal
Outdated
| if os(darwin) | ||
| extra-libraries: c++ |
There was a problem hiding this comment.
Can we move this up so the diff looks smaller?
| @@ -103,8 +104,17 @@ library | |||
| Paths_hevm | |||
| autogen-modules: | |||
| Paths_hevm | |||
| if os(linux) || os(windows) | |||
| if impl(ghc >= 9.4) && !os(darwin) | |||
There was a problem hiding this comment.
not sure we need the ghc version condition here. I'm fine with only supporting 9.4+ unless you need older versions for echidna?
There was a problem hiding this comment.
We actually just moved echidna to 9.4 😄 so if you'd prefer to only support 9.4+ that's fine by me. It's not a lot of code to keep the 9.2 build-ability though (just the else block after this bit)
| if os(linux) || os(windows) | ||
| if impl(ghc >= 9.4) && !os(darwin) | ||
| -- darwin is skipped because it produces this error when building | ||
| -- > ghc: loadArchive: Neither an archive, nor a fat archive: `/nix/store/l3lkdfm7sg1wwc850451cikqds766h15-clang-wrapper-11.1.0/bin/clang++' |
There was a problem hiding this comment.
I've seen this error before, iirc I was able to fix by adding the config to the executables instead of the library (that's why we have extra-libaries: c++ duplicated a few times). Maybe that would work too for the system-cxx-std-lib stuff too?
There was a problem hiding this comment.
Unfortunately it does not 😞 if I apply this example diff on top of this PR, it stops building correctly. That's why I opted to generalize it for !darwin with the new build-depends: system-cxx-std-lib but keep the duplicated extra-libraries: c++ in the executables for darwin
diff --git a/hevm.cabal b/hevm.cabal
index 2ebc62b6..b66c901d 100644
--- a/hevm.cabal
+++ b/hevm.cabal
@@ -196,7 +196,7 @@ executable hevm
other-modules:
Paths_hevm
if os(darwin)
- extra-libraries: c++
+ build-depends: system-cxx-std-lib
build-depends:
QuickCheck,
aeson, > [1 of 2] Compiling Paths_hevm ( dist/build/hevm/autogen/Paths_hevm.hs, dist/build/hevm/hevm-tmp/Paths_hevm.o, dist/build/hevm/hevm-tmp/Paths_hevm.dyn_o )
> [2 of 2] Compiling Main ( cli/cli.hs, dist/build/hevm/hevm-tmp/Main.o, dist/build/hevm/hevm-tmp/Main.dyn_o )
> ghc: loadArchive: Neither an archive, nor a fat archive: `/nix/store/l3lkdfm7sg1wwc850451cikqds766h15-clang-wrapper-11.1.0/bin/clang++'
>
> <no location info>: error:
> loadArchive "/nix/store/l3lkdfm7sg1wwc850451cikqds766h15-clang-wrapper-11.1.0/bin/clang++": failed
> /nix/store/1k85b7faqm8pc0k3y553zr8bfhb2dv2z-ghc-9.4.6/bin/ghc returned
> ExitFailure 1
|
Hi @msooseth! I tried building a static binary as follows on an M1 Mac and it built fine -- although the binary did not run, as it was not signed. I added an extra commit to implement signing now, and the resulting binary appears to execute fine at first glance. I don't have an Intel Mac to verify if it works over there. hevm % nix build .#redistributable --out-link hevmMacos
hevm % otool -L ./hevmMacos/bin/hevm
./hevmMacos/bin/hevm:
/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.60.1)
/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 1.0.0)
/usr/lib/libiconv.dylib (compatibility version 7.0.0, current version 7.0.0)
hevm % ./hevmMacos/bin/hevm version
0.51.3 [no git revision present]I also moved those blocks around to reduce the diff noise as you requested. Update: I tried the same process quoted above on Intel macOS and the resulting binary worked fine as well. |
Description
This PR introduces several changes to the Windows CI in order to build with GHC 9.4
GHC 9.4 currently breaks on Windows because it now uses a Clang-based toolchain and the C++ standard library name does no longer match:
Additionally, GHC 9.4 now requires the CLANG64 environment in MSYS2 for native code linking:
GHC 9.4 introduces a generic way of linking against the system C++ standard library,
build-depends: system-cxx-std-lib:This can be used to reliably link against the system's C++ standard library implementation without having to use platform-dependent conditionals. Unfortunately it does not properly work on Nix, so we link manually on Darwin to work around the issue:
The GitHub runner also has many things preinstalled that tend to cause conflicts during building. This PR switches it to use the minimal MSYS2 path option and adds-in the Haskell tools we need instead.
Checklist