diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-05-27 15:38:30 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-05-27 15:38:30 -0700 |
| commit | 0ebd5afc3bea89070ecb2db5e89b1b3c4db62699 (patch) | |
| tree | d72981b3765b20cbcaf1399de4ea380f16d73bbf /make_osx_package.sh | |
| parent | 067dcb921a115e94a6b9460a22b7486aade4cbb2 (diff) | |
Revert "make_osx_package.sh: don't use cpphs."
This reverts commit 067dcb921a115e94a6b9460a22b7486aade4cbb2.
Diffstat (limited to 'make_osx_package.sh')
| -rwxr-xr-x | make_osx_package.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/make_osx_package.sh b/make_osx_package.sh index df0fc8554..6030f7032 100755 --- a/make_osx_package.sh +++ b/make_osx_package.sh @@ -12,6 +12,7 @@ SCRIPTS=$OSX/osx-resources BASE=pandoc-$VERSION ME=$(whoami) PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker +CPPHS=$SANDBOX/bin/cpphs # echo Removing old files... rm -rf $DIST @@ -25,7 +26,7 @@ echo Building pandoc... cabal clean # Use cpphs to avoid problems with clang cpp on ghc 7.8 osx: cabal install cpphs hsb2hs -cabal install --ghc-options="-optl-mmacosx-version-min=10.6" --reinstall --flags="embed_data_files make-pandoc-man-pages" . pandoc-citeproc +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 make man # get pandoc-citeproc man page: |