aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-12-18 12:56:16 +0000
committerIan Lynagh <igloo@earth.li>2011-12-18 12:56:16 +0000
commit505df72e9e0962e01cf031f799d8d8940ced73b1 (patch)
tree5b30f549dcd72e718a43a3239cc880d93848b9d6
parentc8301a41d924d83f6e5160778d19016f2f1806ce (diff)
Fix (untested) building from source tarball without alex/happy
haddock's .cabal file was declaring that it needed alex and happy to build, but in the GHC source tarballs it doesn't.
-rw-r--r--haddock.cabal10
1 files changed, 8 insertions, 2 deletions
diff --git a/haddock.cabal b/haddock.cabal
index a9e14fab..63ed5cd8 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -78,7 +78,10 @@ flag test
executable haddock
default-language: Haskell2010
- build-tools: alex >= 2.3, happy >= 1.18
+ -- In a GHC tree - in particular, in a source tarball - we don't
+ -- require alex or happy
+ if !flag(in-ghc-tree)
+ build-tools: alex >= 2.3, happy >= 1.18
build-depends:
base >= 4.3 && < 4.6,
filepath,
@@ -138,7 +141,10 @@ executable haddock
library
default-language: Haskell2010
- build-tools: alex >= 2.3, happy >= 1.18
+ -- In a GHC tree - in particular, in a source tarball - we don't
+ -- require alex or happy
+ if !flag(in-ghc-tree)
+ build-tools: alex >= 2.3, happy >= 1.18
build-depends:
base >= 4.3 && < 4.6,
filepath,