diff options
| author | John MacFarlane <fiddlosopher@gmail.com> | 2011-08-18 12:12:45 -0700 |
|---|---|---|
| committer | John MacFarlane <fiddlosopher@gmail.com> | 2011-08-18 12:12:45 -0700 |
| commit | f1c33c2958d5a1116309569ce677022bb2924d4a (patch) | |
| tree | 4bb2eb428df1a21d56d23967c71dcc12f96338da /pandoc.cabal | |
| parent | 2fd25e2055a808f5d00eedf289ec519213b3eb4b (diff) | |
Revert "Workaround for linker errors in macosx + ghc 7.0.3."
This reverts commit 54520c4e6f6f26d5dee21f97fc561ff69e03f883.
Diffstat (limited to 'pandoc.cabal')
| -rw-r--r-- | pandoc.cabal | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 7e903f002..757254c36 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -219,13 +219,10 @@ Library if flag(highlighting) Build-depends: highlighting-kate >= 0.2.9 && < 0.3 cpp-options: -D_HIGHLIGHTING - if impl(ghc == 7.0.3) && os(macosx) - Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind -optl-Wl,-no_pie + if impl(ghc >= 6.12) + Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind else - if impl(ghc >= 6.12) - Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind - else - Ghc-Options: -O2 -Wall + Ghc-Options: -O2 -Wall Ghc-Prof-Options: -auto-all -caf-all Extensions: CPP Hs-Source-Dirs: src @@ -308,13 +305,10 @@ Executable pandoc if flag(highlighting) Build-depends: highlighting-kate >= 0.2.9 && < 0.3 cpp-options: -D_HIGHLIGHTING - if impl(ghc == 7.0.3) && os(macosx) - Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind -optl-Wl,-no_pie + if impl(ghc >= 6.12) + Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind else - if impl(ghc >= 6.12) - Ghc-Options: -O2 -Wall -fno-warn-unused-do-bind - else - Ghc-Options: -O2 -Wall + Ghc-Options: -O2 -Wall Ghc-Prof-Options: -auto-all -caf-all Extensions: CPP Hs-Source-Dirs: src |