diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-01-28 23:33:11 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-01-28 23:33:11 +0000 |
| commit | 2a54a0d622a4fa4b62accb2537eb4fc7736d6bb4 (patch) | |
| tree | 512afb418744f0b303b5bf5367db8e8759ae08ce /rules/build-package-data.mk | |
| parent | 41678b9e4e8e4b0fd0ebd944ba2ec3259f027626 (diff) | |
| download | haskell-2a54a0d622a4fa4b62accb2537eb4fc7736d6bb4.tar.gz | |
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.
Diffstat (limited to 'rules/build-package-data.mk')
| -rw-r--r-- | 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 6755a2cd9b..fd267b0347 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" |