Skip to content

Commit

Permalink
hevm: unify C++ stdlib dependency and compilation flags for darwin
Browse files Browse the repository at this point in the history
  • Loading branch information
elopez committed Jul 24, 2024
1 parent 34cb93b commit 653805f
Showing 1 changed file with 5 additions and 15 deletions.
20 changes: 5 additions & 15 deletions hevm.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,10 @@ library
Paths_hevm
autogen-modules:
Paths_hevm
if os(linux)
build-depends: system-cxx-std-lib
extra-libraries: stdc++
if os(darwin)
-- https://gitlab.haskell.org/ghc/ghc/-/issues/11829
ld-options: -Wl,-keep_dwarf_unwind
ghc-options: -fcompact-unwind
extra-libraries:
secp256k1, ff, gmp
c-sources:
Expand All @@ -125,6 +126,7 @@ library
install-includes:
ethjet/tinykeccak.h, ethjet/ethjet.h, ethjet/ethjet-ff.h, ethjet/blake2.h
build-depends:
system-cxx-std-lib >= 1.0 && < 2.0,
QuickCheck >= 2.13.2 && < 2.15,
quickcheck-text >= 0.1.2 && < 0.2,
Decimal >= 0.5.1 && < 0.6,
Expand Down Expand Up @@ -184,11 +186,6 @@ executable hevm
Paths_hevm
autogen-modules:
Paths_hevm
if os(darwin)
extra-libraries: c++
-- https://gitlab.haskell.org/ghc/ghc/-/issues/11829
ld-options: -Wl,-keep_dwarf_unwind
ghc-options: -fcompact-unwind
build-depends:
QuickCheck,
aeson,
Expand Down Expand Up @@ -296,11 +293,6 @@ common test-common
EVM.Test.BlockchainTests
if os(windows)
buildable: False
if os(darwin)
extra-libraries: c++
-- https://gitlab.haskell.org/ghc/ghc/-/issues/11829
ld-options: -Wl,-keep_dwarf_unwind
ghc-options: -fcompact-unwind

--- Test Suites ---

Expand Down Expand Up @@ -342,8 +334,6 @@ benchmark bench
bench
ghc-options:
-O2
if os(darwin)
extra-libraries: c++
other-modules:
Paths_hevm
autogen-modules:
Expand Down

0 comments on commit 653805f

Please sign in to comment.