@@ -13,6 +13,7 @@ ME=$(whoami)
1313CODESIGNID="3rd Party Mac Developer Application: John Macfarlane"
1414PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
1515EXES="pandoc pandoc-citeproc"
16+CPPHS=$SANDBOX/bin/cpphs
1617
1718read -s -p "sudo password: " PASSWORD
1819echo $PASSWORD | sudo -S echo "Password valid, continuing."
@@ -29,8 +30,8 @@ echo Building pandoc...
2930cabal clean
3031# Use cpphs to avoid problems with clang cpp on ghc 7.8 osx:
3132cabal install cpphs hsb2hs
32−cabal install --ghc-options="-optl-mmacosx-version-min=10.6" --reinstall --flags="embed_data_files" --ghc-options '-pgmPcpphs -optP--cpp'
33−cabal install --ghc-options="-optl-mmacosx-version-min=10.6" --reinstall --flags="embed_data_files" pandoc-citeproc --ghc-options '-pgmPcpphs -optP--cpp'
33+cabal install --ghc-options="-optl-mmacosx-version-min=10.6" --reinstall --flags="embed_data_files" --ghc-options "-pgmP$CPPHS -optP--cpp"
34+cabal install --ghc-options="-optl-mmacosx-version-min=10.6" --reinstall --flags="embed_data_files" pandoc-citeproc --ghc-options "-pgmP$CPPHS -optP--cpp"
3435
3536mkdir -p $DEST/bin
3637mkdir -p $DEST/share/man/man1