diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-14 10:42:17 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-14 10:42:27 +0100 |
| commit | baed2f5a26a5d4c4e951bd8f003f71fca3ef45e8 (patch) | |
| tree | e7b744c925ff52d50bcef144921bbba1c5a22b3f | |
| parent | fcc6b1def57d3009f9a3662a96d87ee041eb49b8 (diff) | |
| download | haskell-baed2f5a26a5d4c4e951bd8f003f71fca3ef45e8.tar.gz | |
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
| -rw-r--r-- | rules/build-package-data.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 3525c915d3..17b87e021e 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)") |