Don't pass CC= explicitly to `./configure` scripts
authorHerbert Valerio Riedel <hvr@gnu.org>
Mon, 14 Dec 2015 09:42:17 +0000 (10:42 +0100)
committerHerbert Valerio Riedel <hvr@gnu.org>
Mon, 14 Dec 2015 09:42:27 +0000 (10:42 +0100)
This is a follow-up to fcc6b1d / D1608 which is made possible
by the recent Cabal update:

As `ghc-cabal` is called with `--with-gcc`, this gets passed to `./configure`
as `CC=...` argument. So we don't need to set `CC=...` ourselves explicitly again.

Prior to the changes in Cabal (pulled in via  0bf0cf936c7) and fcc6b1d,
`./configure` scripts would be called with a `--with-cc` argument followed by a
`--with-gcc` argument.

After this commit, `./configure` will be passed a single `CC=...` argument
constructed by the `Cabal` library.

Reviewed By: erikd

Differential Revision: https://phabricator.haskell.org/D1611

rules/build-package-data.mk

index 3525c91..17b87e0 100644 (file)
@@ -111,7 +111,6 @@ ifneq "$3" "0"
 $1_$2_CONFIGURE_OPTS += --with-ld="$$(LD_STAGE$3)"
 endif
 
-$1_$2_CONFIGURE_OPTS += --configure-option=CC="$$(CC_STAGE$3)"
 $1_$2_CONFIGURE_OPTS += --with-ar="$$(AR_STAGE$3)"
 $1_$2_CONFIGURE_OPTS += $$(if $$(ALEX),--with-alex="$$(ALEX)")
 $1_$2_CONFIGURE_OPTS += $$(if $$(HAPPY),--with-happy="$$(HAPPY)")