summaryrefslogtreecommitdiff
path: root/linux/Dockerfile
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2017-09-04 18:11:55 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2017-09-04 18:11:55 -0700
commit2637df2bdfdffe55dc7363feac188d9144f18fea (patch)
tree5c5808abf19b66522bc80e98f05b3f016561c225 /linux/Dockerfile
parent1d0805ce414398d5ff70c9ed3dbe1288356c7dd9 (diff)
Revert use of llvm backend in static linux build.
It was failing for reasons I couldn't diagnose.
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 a8dc9bfd2..c347d4ccc 100644
--- a/linux/Dockerfile
+++ b/linux/Dockerfile
@@ -5,7 +5,7 @@ ADD https://raw.githubusercontent.com/mitchty/alpine-ghc/master/mitch.tishmack%4
/etc/apk/keys/mitch.tishmack@gmail.com-55881c97.rsa.pub
RUN apk update
RUN apk add alpine-sdk git ca-certificates ghc cabal stack zlib-dev \
- dpkg fakeroot sed gawk grep llvm linux-headers
+ dpkg fakeroot sed gawk grep linux-headers
RUN stack update
RUN stack config set system-ghc --global true
RUN mkdir -p /etc/stack
@@ -23,7 +23,7 @@ CMD git pull && \
stack install --stack-yaml stack.pkg.yaml \
--flag 'pandoc:static' \
--flag 'pandoc:embed_data_files' \
- --ghc-options '-fPIC -fllvm' \
+ --ghc-options '-O2 -optc-Os -fPIC' \
--local-bin-path /artifacts \
pandoc pandoc-citeproc && \
bash linux/make_deb.sh && \