[commit: ghc] master: Don't pass CC= explicitly to `./configure` scripts (baed2f5)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/baed2f5a26a5d4c4e951bd8f003f71fca3ef45e8/ghc

>---------------------------------------------------------------

commit baed2f5a26a5d4c4e951bd8f003f71fca3ef45e8
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 14 10:42:17 2015 +0100

    Don't pass CC= explicitly to `./configure` scripts
    
    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


>---------------------------------------------------------------

baed2f5a26a5d4c4e951bd8f003f71fca3ef45e8
 rules/build-package-data.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 3525c91..17b87e0 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -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)")