diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2010-04-20 22:59:38 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2010-04-20 22:59:38 -0700 |
| commit | 0d5065c1e763a24e431b3c324cf8bc6390673ff2 (patch) | |
| tree | 732b6a949244abf53ce5395e3387dac2596eb9df /pandoc.cabal | |
| parent | 5d9d7f32cacde467a747b7ae8e7d8d85a410e528 (diff) | |
| download | pandoc-0d5065c1e763a24e431b3c324cf8bc6390673ff2.tar.gz | |
Added 'threaded' flag.
+ GHC lacks a threaded runtime on some architectures.
Provide a 'threaded' flag that can be disabled for compiling
on these architectures.
+ Removed '-threaded' from pandoc's ghc-options. '-threaded'
is only needed for markdown2pdf, due to its use of readProcess.
Diffstat (limited to 'pandoc.cabal')
| -rw-r--r-- | pandoc.cabal | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 025b72c43..d7202616b 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -122,6 +122,9 @@ Extra-Source-Files: tests/RunTests.hs Extra-Tmp-Files: man/man1/pandoc.1, man/man1/markdown2pdf.1 +Flag threaded + Description: Compile markdown2pdf with -threaded option. + Default: True Flag highlighting Description: Compile in support for syntax highlighting of code blocks. Default: False @@ -195,9 +198,9 @@ Executable pandoc Hs-Source-Dirs: src Main-Is: pandoc.hs if impl(ghc >= 6.12) - Ghc-Options: -O2 -Wall -threaded -fno-warn-unused-do-bind + Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind else - Ghc-Options: -O2 -Wall -threaded + Ghc-Options: -O2 -Wall Ghc-Prof-Options: -auto-all -caf-all Extensions: CPP @@ -214,7 +217,10 @@ Executable pandoc Executable markdown2pdf Hs-Source-Dirs: src Main-Is: markdown2pdf.hs - Ghc-Options: -Wall -threaded + if flag(threaded) + Ghc-Options: -Wall -threaded + else + Ghc-Options: -Wall Ghc-Prof-Options: -auto-all Extensions: CPP if flag(wrappers) |