git.iko.soy/typeable/pandoc
on master help sign in
Revert "make_osx_package.sh: don't use cpphs."

This reverts commit 067dcb921a115e94a6b9460a22b7486aade4cbb2.

commit0ebd5afc3bea89070ecb2db5e89b1b3c4db62699 authorJohn MacFarlane <jgm@berkeley.edu> dateWed 27 May 2015, 15:38 (11 years ago) parent067dcb9
1 file changed+2−1
compare with master
unifiedsplit
make_osx_package.sh+2−1
make_osx_package.sh+2−1
@@ -12,6 +12,7 @@ SCRIPTS=$OSX/osx-resources
1212BASE=pandoc-$VERSION
1313ME=$(whoami)
1414PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
15+CPPHS=$SANDBOX/bin/cpphs
1516
1617# echo Removing old files...
1718rm -rf $DIST
@@ -25,7 +26,7 @@ echo Building pandoc...
2526cabal clean
2627# Use cpphs to avoid problems with clang cpp on ghc 7.8 osx:
2728cabal install cpphs hsb2hs
28−cabal install --ghc-options="-optl-mmacosx-version-min=10.6" --reinstall --flags="embed_data_files make-pandoc-man-pages" . pandoc-citeproc
29+cabal install --ghc-options="-optl-mmacosx-version-min=10.6" --reinstall --flags="embed_data_files make-pandoc-man-pages" --ghc-options "-pgmP$CPPHS -optP--cpp" . pandoc-citeproc
2930
3031make man
3132# get pandoc-citeproc man page: