diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2021-03-18 09:14:12 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2021-03-18 09:14:12 -0700 |
| commit | 89a89a8cf33e1558e8a477f98a2c73bc224ccf60 (patch) | |
| tree | 4434db9055c86a2e2a94cc9deb9237962d5066fe | |
| parent | 27d7652329a5576f928cc5209324e618560b610f (diff) | |
| download | pandoc-89a89a8cf33e1558e8a477f98a2c73bc224ccf60.tar.gz | |
make_artifacts.sh: try using -j for cabal rather than -j4 ghc-options.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | linux/make_artifacts.sh | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -26,7 +26,7 @@ quick: quick-cabal: cabal new-configure . --ghc-options '$(GHCOPTS)' --disable-optimization --enable-tests - cabal new-build . --disable-optimization + cabal new-build -j4 . --disable-optimization cabal new-run test-pandoc --disable-optimization -- --hide-successes $(TESTARGS) full-cabal: @@ -35,7 +35,7 @@ full-cabal: cabal new-run test-pandoc --disable-optimization -- --hide-successes $(TESTARGS) full: - stack install --flag 'pandoc:embed_data_files' --flag 'pandoc:trypandoc' --bench --no-run-benchmarks --test --test-arguments='-j4 --hide-successes' --ghc-options '-Wall -Werror -fno-warn-unused-do-bind -O0 -j4 $(GHCOPTS)' + stack install --flag 'pandoc:embed_data_files' --flag 'pandoc:trypandoc' --bench --no-run-benchmarks --test --test-arguments='-j4 --hide-successes' --ghc-options '-Wall -Werror -fno-warn-unused-do-bind -O0 $(GHCOPTS)' ghci: stack ghci --flag 'pandoc:embed_data_files' diff --git a/linux/make_artifacts.sh b/linux/make_artifacts.sh index cb7bf4c8c..b5625be1f 100644 --- a/linux/make_artifacts.sh +++ b/linux/make_artifacts.sh @@ -26,9 +26,9 @@ ghc --version cabal v2-update cabal v2-clean -cabal v2-configure --enable-tests -f-export-dynamic -fembed_data_files --enable-executable-static --ghc-options '-j4 +RTS -A256m -RTS -split-sections -optc-Os -optl=-pthread' pandoc -cabal v2-build -cabal v2-test -j4 +cabal v2-configure --enable-tests -f-export-dynamic -fembed_data_files --enable-executable-static --ghc-options '+RTS -A256m -RTS -split-sections -optc-Os -optl=-pthread' pandoc +cabal v2-build -j +cabal v2-test -j for f in $(find dist-newstyle -name 'pandoc' -type f -perm /400); do cp $f /artifacts/; done # make deb |