From f1c33c2958d5a1116309569ce677022bb2924d4a Mon Sep 17 00:00:00 2001
From: John MacFarlane <fiddlosopher@gmail.com>
Date: Thu, 18 Aug 2011 12:12:45 -0700
Subject: [PATCH] Revert "Workaround for linker errors in macosx + ghc 7.0.3."
This reverts commit 54520c4e6f6f26d5dee21f97fc561ff69e03f883.
---
pandoc.cabal | 18 ++++++------------
1 file 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