diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-14 07:36:37 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-14 08:06:46 +0100 |
| commit | fcc6b1def57d3009f9a3662a96d87ee041eb49b8 (patch) | |
| tree | fff99016bef3f2c5fc6c36eb3775c3ba0e86bf02 /rules/build-package-data.mk | |
| parent | 0bf0cf936c7895b19d0fd6a19d5238eed6c8feb6 (diff) | |
| download | haskell-fcc6b1def57d3009f9a3662a96d87ee041eb49b8.tar.gz | |
Use idiomatic way to tell Autoconf the c compiler
The non-idiomatic `--with-cc` flag was added via
5c789e424c1461c1dadfd38c44fcb9e8f38bf755
However, `--with-cc` seems rather fragile and support for `--with-cc` needs
to be added explicitly to autoconf-based Cabal packages. The `CC=` flag, however,
is supported natively by GNU Autoconf, so let's use the standard facility for that.
Relatedly, Cabal prior to version 1.24 used a similiar flag `--with-gcc=...`,
but starting with Cabal-1.24 this has been changed to use `CC=...` instead as well
(see https://github.com/haskell/cabal/pull/2946)
This also updates a few submodules removing the now obsolete `--with-cc` flag
support.
Reviewed By: trofi, thomie, erikd
Differential Revision: https://phabricator.haskell.org/D1608
Diffstat (limited to 'rules/build-package-data.mk')
| -rw-r--r-- | rules/build-package-data.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 938b6bf2c2..3525c915d3 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -111,7 +111,7 @@ ifneq "$3" "0" $1_$2_CONFIGURE_OPTS += --with-ld="$$(LD_STAGE$3)" endif -$1_$2_CONFIGURE_OPTS += --configure-option=--with-cc="$$(CC_STAGE$3)" +$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)") |