diff options
| author | John MacFarlane <[email protected]> | 2023-03-12 13:26:54 -0700 |
|---|---|---|
| committer | John MacFarlane <[email protected]> | 2023-03-12 13:26:54 -0700 |
| commit | fa62239a5d38dea09cfe5cd4901231117d51810e (patch) | |
| tree | fa1fb4f1a45bb861e0390f30ecbc2715bc1a33e5 | |
| parent | 692023cc454fe86bbcf08b27cb9601b47e324e8b (diff) | |
More cirrus fixes.
| -rw-r--r-- | .cirrus.yml | 5 | ||||
| -rw-r--r-- | linux/make_artifacts.sh | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 3165c45a5..839adaaee 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -28,13 +28,14 @@ task: cpu: 4 memory: 12G env: - CABALOPTS: -f-export-dynamic -fembed_data_files -fserver -flua --enable-executable-static -j4 --ghc-options='-j4 +RTS -A256m -RTS -split-sections -optc-Os -optl=-pthread' + CABALOPTS: -f-export-dynamic -fembed_data_files -fserver -flua --enable-executable-static -j4 + GHCOPTS: -j4 +RTS -A256m -RTS -split-sections -optc-Os -optl=-pthread cabal_store_cache: folder: ~/.cabal/store fingerprint_key: linux_arm64_2023_03_11 deps_script: - cabal update - - cabal build --dependencies-only $CABALOPTS pandoc-cli + - cabal build --dependencies-only $CABALOPTS --ghc-options="$GHCOPTS" pandoc-cli upload_caches: - cabal_store package_script: diff --git a/linux/make_artifacts.sh b/linux/make_artifacts.sh index e80ff01a3..02b0a9a22 100644 --- a/linux/make_artifacts.sh +++ b/linux/make_artifacts.sh @@ -1,9 +1,9 @@ #!/bin/bash set -e -cabal build $CABALOPTS pandoc-cli +cabal build $CABALOPTS --ghc-options="$GHCOPTS" pandoc-cli BINPATH=$(cabal -BINPATH=$(cabal list-bin $CABALOPTS pandoc-cli) +BINPATH=$(cabal list-bin $CABALOPTS --ghc-options="$GHCOPTS" pandoc-cli) echo "Built executable: $BINPATH" WORK="$(pwd)" |