summaryrefslogtreecommitdiff
path: root/linux/Dockerfile
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2017-09-05 08:36:13 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2017-09-05 08:36:13 -0700
commit4170a184797ecacc5e9dc7462eb29c313598489f (patch)
tree0e3eed2f0fde8f9c493b31de2b31be0c4be7f35f /linux/Dockerfile
parent9fdc089cd85e46148720f368644e8badd168f5b8 (diff)
Another try to get linux static linking working again.
Diffstat (limited to 'linux/Dockerfile')
-rw-r--r--linux/Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/Dockerfile b/linux/Dockerfile
index 91df3b8a2..f75db2c89 100644
--- a/linux/Dockerfile
+++ b/linux/Dockerfile
@@ -16,14 +16,14 @@ RUN git clone https://github.com/jgm/pandoc
WORKDIR /usr/src/pandoc
RUN stack install --stack-yaml stack.pkg.yaml --only-dependencies \
--flag 'pandoc:embed_data_files' \
- --ghc-options '-fPIC -fllvm' \
+ --ghc-options '-O2 -optc-Os -optl=-pthread -optl=-static -fPIC' \
pandoc pandoc-citeproc
CMD git pull && \
git checkout -b work $TREE && \
stack install --stack-yaml stack.pkg.yaml \
--flag 'pandoc:static' \
--flag 'pandoc:embed_data_files' \
- --ghc-options '-O2 -optc-Os -fPIC' \
+ --ghc-options '-O2 -optc-Os -optl=-pthread -optl=-static -fPIC' \
--local-bin-path /artifacts \
pandoc pandoc-citeproc && \
bash linux/make_deb.sh && \