summaryrefslogtreecommitdiff
path: root/make_osx_package.sh
diff options
context:
space:
mode:
authorJohn MacFarlane <fiddlosopher@gmail.com>2014-05-04 18:48:38 -0700
committerJohn MacFarlane <fiddlosopher@gmail.com>2014-05-04 18:48:38 -0700
commitf31e0027263c500ea41405cddac640312793b12b (patch)
tree8887f1dd41734a423e8632607c77293f13626ad9 /make_osx_package.sh
parent0edbb5597c447a6fc03bf0df4e1f4a7e58a7b7ee (diff)
make_osx_package: Use cpphs to avoid problems with clang cpp.
See https://github.com/jgm/pandoc/issues/1172
Diffstat (limited to 'make_osx_package.sh')
-rwxr-xr-xmake_osx_package.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/make_osx_package.sh b/make_osx_package.sh
index 6c943c84a..fc3691218 100755
--- a/make_osx_package.sh
+++ b/make_osx_package.sh
@@ -26,8 +26,10 @@ cabal update
echo Building pandoc...
cabal sandbox init
cabal clean
-cabal install --reinstall --flags="embed_data_files"
-cabal install --reinstall --flags="embed_data_files" pandoc-citeproc
+# Use cpphs to avoid problems with clang cpp on ghc 7.8 osx:
+which cpphs || cabal install cpphs
+cabal install --reinstall --flags="embed_data_files" --ghc-options '-pgmPcpphs -optP--cpp'
+cabal install --reinstall --flags="embed_data_files" pandoc-citeproc --ghc-options '-pgmPcpphs -optP--cpp'
mkdir -p $DEST/bin
mkdir -p $DEST/share/man/man1