@@ -111,6 +111,7 @@ jobs:
111
111
echo FOUNDRY_PATH="$(dirname "$(which forge)")" >> "$GITHUB_ENV"
112
112
shell: bash
113
113
- uses : msys2/setup-msys2@v2
114
+ id : msys2
114
115
with :
115
116
msystem : CLANG64
116
117
path-type : minimal
@@ -143,9 +144,11 @@ jobs:
143
144
HASKELL_MINGW_PATH="$(cygpath -u "$GHC_PATH/../mingw")"
144
145
echo "HASKELL_PATHS=$HASKELL_PATHS" >> "$GITHUB_ENV"
145
146
echo "HASKELL_MINGW_PATH=$HASKELL_MINGW_PATH" >> "$GITHUB_ENV"
147
+ echo "SYSTEM_MINGW_PATH="$(cygpath -m "$MSYS2_LOCATION/$MSYSTEM")" >> "$GITHUB_ENV"
146
148
env :
147
149
GHC_PATH : ${{ steps.setup.outputs.ghc-path }}
148
150
CABAL_PATH : ${{ steps.setup.outputs.cabal-path }}
151
+ MSYS2_LOCATION : ${{ steps.msys2.outputs.msys2-location }}
149
152
150
153
- name : build and install c dependencies
151
154
run : |
@@ -162,9 +165,9 @@ jobs:
162
165
cabal configure --disable-documentation --enable-executable-static --enable-executable-stripping \
163
166
--extra-lib-dirs="$(cygpath -m "$HASKELL_MINGW_PATH/x86_64-w64-mingw32/lib")" \
164
167
--extra-lib-dirs="$(cygpath -m "$HASKELL_MINGW_PATH/lib")" \
165
- --extra-lib-dirs="D:/a/_temp/msys64/clang64 /lib" \
168
+ --extra-lib-dirs="$SYSTEM_MINGW_PATH /lib" \
166
169
--extra-include-dirs="$HOME/.local/include" --extra-lib-dirs="$HOME/.local/lib" \
167
- --ghc-options=-pgml="$(cygpath -m "$HASKELL_MINGW_PATH/bin/clang.exe") -optc-idirafter -optcD:/a/_temp/msys64/clang64/ include -optcxx-idirafter -optcxxD:/a/_temp/msys64/clang64 /include" -fstatic-secp256k1 --constraint="zlib +bundled-c-zlib"
170
+ --ghc-options=-pgml="$(cygpath -m "$HASKELL_MINGW_PATH/bin/clang.exe") -optc-idirafter -optc$SYSTEM_MINGW_PATH/ include -optcxx-idirafter -optcxx$SYSTEM_MINGW_PATH /include" -fstatic-secp256k1 --constraint="zlib +bundled-c-zlib"
168
171
cabal build --dry-run
169
172
# The last step generates dist-newstyle/cache/plan.json for the cache key.
170
173
0 commit comments