Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/2a54a0d622a4fa4b62accb2537eb4fc7736d6bb4 >--------------------------------------------------------------- commit 2a54a0d622a4fa4b62accb2537eb4fc7736d6bb4 Author: Ian Lynagh <[email protected]> Date: Sat Jan 28 23:33:11 2012 +0000 Pass alex and happy locations to ghc-cabal; fixes #5579 We only use --with-alex / --with-happy if we know where alex / happy are. In particular, we don't need them when building from a source tarball. >--------------------------------------------------------------- rules/build-package-data.mk | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 6755a2c..fd267b0 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -67,6 +67,8 @@ $1_$2_CONFIGURE_OPTS += --with-gcc="$$(CC_STAGE$3)" $1_$2_CONFIGURE_OPTS += --configure-option=--with-cc="$$(CC_STAGE$3)" $1_$2_CONFIGURE_OPTS += --with-ar="$$(AR_STAGE$3)" $1_$2_CONFIGURE_OPTS += --with-ranlib="$$(RANLIB)" +$1_$2_CONFIGURE_OPTS += $$(if $$(ALEX),--with-alex="$$(ALEX)") +$1_$2_CONFIGURE_OPTS += $$(if $$(HAPPY),--with-happy="$$(HAPPY)") ifneq "$$(BINDIST)" "YES" ifneq "$$(NO_GENERATED_MAKEFILE_RULES)" "YES" _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
