diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2020-07-24 09:57:27 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2020-08-11 21:33:21 -0700 |
| commit | c9900278321a14071c6721fdfb702e39ca5e2a38 (patch) | |
| tree | 1724171740a0569330e7c48d055e13735878a4b4 /Makefile | |
| parent | 5d4932d7ef8e1edec31d99661ffe8e2f4a77244f (diff) | |
| download | pandoc-c9900278321a14071c6721fdfb702e39ca5e2a38.tar.gz | |
Linux rc build: use ghc-musl container.
This simplifies our build process a bit (over using
a customized alpine container).
Use new `--enable-executable-static` flag in build.
make_artifacts.sh: Fix deprecated find -perm syntax.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -5,6 +5,7 @@ BRANCH?=master RESOLVER?=lts-13 GHCOPTS=-fdiagnostics-color=always WEBSITE=../../web/pandoc.org +REVISION?=1 quick: stack install --ghc-options='$(GHCOPTS)' --install-ghc --flag 'pandoc:embed_data_files' --fast --test --ghc-options='-j +RTS -A64m -RTS' --test-arguments='-j4 --hide-successes $(TESTARGS)' @@ -70,8 +71,12 @@ checkdocs: README.md ! grep -n -e "\t" MANUAL.txt changelog debpkg: man/pandoc.1 - make -C linux && \ - cp linux/artifacts/pandoc-$(version)-*.* . + docker run -v `pwd`:/mnt \ + -v `pwd`/linux/artifacts:/artifacts \ + -e REVISION=$(REVISION) \ + -w /mnt \ + utdemir/ghc-musl:v12-libgmp-ghc8101 bash \ + /mnt/linux/make_artifacts.sh macospkg: man/pandoc.1 ./macos/make_macos_package.sh |