From 70de79a681cc639f1829d8db48920a146bac3ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <emilio.lopez@trailofbits.com>
Date: Mon, 23 Oct 2023 20:30:20 -0300
Subject: [PATCH] ci: also include paths in test build

---
 .github/workflows/ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a1f17e189..9e46a12ca 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -140,12 +140,15 @@ jobs:
       - name: Build and copy test suite
         if: runner.os != 'macOS'
         run: |
-          stack build --flag echidna:static --test --no-run-tests --ghc-options="-Werror" --extra-include-dirs=$HOME/.local/include --extra-lib-dirs=$HOME/.local/lib
+          export PATH="$HASKELL_PATHS:$PATH"
+          stack build --flag echidna:static --test --no-run-tests --ghc-options="-Werror" --extra-include-dirs=$HOME/.local/include --extra-lib-dirs=$HOME/.local/lib $EXTRA_ARGS_WIN
           cp "$(find "$PWD" -name 'echidna-testsuite*' -type f)" .
           if [ "${{ runner.os }}" = "Windows" ]; then
             # work around https://gitlab.haskell.org/ghc/ghc/-/issues/21109
             strip echidna-testsuite*
           fi
+        env:
+          EXTRA_ARGS_WIN: ${{ (runner.os == 'Windows' && ' --extra-include-dirs=C:/msys64/clang64/include --extra-lib-dirs=C:/msys64/clang64/lib --ghc-options=-pgml=C:/msys64/clang64/bin/clang.exe --ghc-options=-pgml-supports-no-pie') || '' }}  
 
       - name: Upload testsuite
         if: runner.os != 'macOS'