From 505df72e9e0962e01cf031f799d8d8940ced73b1 Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Sun, 18 Dec 2011 12:56:16 +0000
Subject: [PATCH] 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.
---
haddock.cabal | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/haddock.cabal b/haddock.cabal
index a9e14fab84..63ed5cd8eb 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,
--
GitLab