Sorry Ian, I should have asked you before I added those dependencies. Thanks for fixing it and It's good that we now state those dependencies when outside the tree.
David 2011/12/18 Ian Lynagh <[email protected]>: > Repository : ssh://darcs.haskell.org//srv/darcs/haddock > > On branch : ghc-7.4 > > http://hackage.haskell.org/trac/ghc/changeset/505df72e9e0962e01cf031f799d8d8940ced73b1 > >>--------------------------------------------------------------- > > commit 505df72e9e0962e01cf031f799d8d8940ced73b1 > Author: Ian Lynagh <[email protected]> > Date: Sun Dec 18 12:56:16 2011 +0000 > > 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 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/haddock.cabal b/haddock.cabal > index a9e14fa..63ed5cd 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, > > > > _______________________________________________ > Cvs-ghc mailing list > [email protected] > http://www.haskell.org/mailman/listinfo/cvs-ghc _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
