Try dynamic build

elopez/windows-build-refresh-2
Emilio López 2 years ago
parent 80c3e92b43
commit 56250ae8a8
  1. 1
      .github/scripts/install-libff.sh
  2. 6
      .github/workflows/ci.yml
  3. 5
      package.yaml
  4. 3
      src/Main.hs
  5. 2
      stack.yaml

@ -36,6 +36,7 @@ fi
if [ "$HOST_OS" = "Windows" ]; then
ARGS+=("-G" "Ninja")
sed -i 's/find_library(GMP_LIBRARY gmp)/find_library(GMP_LIBRARY NAMES libgmp.a)/' CMakeLists.txt
fi
mkdir -p build

@ -93,6 +93,12 @@ jobs:
env:
HOST_OS: ${{ runner.os }}
- name: Add libraries to PATH (Windows)
if: runner.os == 'Windows'
run: |
echo "${HOME}/.local/bin" >> $GITHUB_PATH
echo "${HOME}/.local/lib" >> $GITHUB_PATH
- name: Build Dependencies
run: |
stack build --ghc-options="-Werror" --extra-include-dirs=$HOME/.local/include --extra-lib-dirs=$HOME/.local/lib --only-dependencies

@ -62,15 +62,14 @@ when:
- condition: os(darwin)
extra-libraries: c++
ld-options: -Wl,-keep_dwarf_unwind
- condition: os(windows)
extra-libraries: stdc++
- condition: "!os(windows)"
cpp-options: -DINTERACTIVE_UI
dependencies:
- brick
- unix
- vty
- condition: os(windows)
extra-libraries:
- gmp
executables:
echidna:

@ -1,4 +1,3 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE RecordWildCards #-}
module Main where
@ -158,9 +157,7 @@ overrideConfig config Options{..} =
where
overrideFormat cfg =
case maybe cfg.uiConf.operationMode NonInteractive cliOutputFormat of
#ifdef INTERACTIVE_UI
Interactive -> cfg
#endif
NonInteractive Text -> cfg { uiConf = cfg.uiConf { operationMode = NonInteractive Text }}
nonInteractive -> cfg { uiConf = cfg.uiConf { operationMode = nonInteractive }
, solConf = cfg.solConf { quiet = True }

@ -5,7 +5,7 @@ packages:
extra-deps:
- git: https://github.com/elopez/hevm.git
commit: 7aabbec288ad46604869bbb77a3285b95b85fb12
commit: a108d8f344e2e2086ca2ada1fc8dd4227ea80bbf
- restless-git-0.7@sha256:346a5775a586f07ecb291036a8d3016c3484ccdc188b574bcdec0a82c12db293,968
- s-cargot-0.1.4.0@sha256:61ea1833fbb4c80d93577144870e449d2007d311c34d74252850bb48aa8c31fb,3525

Loading…
Cancel
Save