diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-04-29 18:50:19 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-04-29 18:50:19 +0100 |
| commit | ee8b17c77e81620680f1bc0850517999a829f717 (patch) | |
| tree | 8a7aefe3f3e841fa32c2ff6e03c70fb412a0a48c /rules/build-package-data.mk | |
| parent | 81ca050634c59d6b9a42a6bdc8224902f20ec542 (diff) | |
| download | haskell-ee8b17c77e81620680f1bc0850517999a829f717.tar.gz | |
Pass the right tool locations to Cabal when generating package.mk files
Diffstat (limited to 'rules/build-package-data.mk')
| -rw-r--r-- | rules/build-package-data.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 86f9323859..9a66d1beb1 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -63,6 +63,11 @@ ifeq "$3" "0" $1_$2_CONFIGURE_OPTS += $$(BOOT_PKG_CONSTRAINTS) endif +$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)" + ifneq "$$(BINDIST)" "YES" ifneq "$$(NO_GENERATED_MAKEFILE_RULES)" "YES" $1/$2/inplace-pkg-config : $1/$2/package-data.mk @@ -72,7 +77,7 @@ $1/$2/build/autogen/cabal_macros.h : $1/$2/package-data.mk # for our build system, and registers the package for use in-place in # the build tree. $1/$2/package-data.mk : $$(GHC_CABAL_INPLACE) $$($1_$2_GHC_PKG_DEP) $1/$$($1_PACKAGE).cabal $$(wildcard $1/configure) $$($1_$2_HC_CONFIG_DEP) - "$$(GHC_CABAL_INPLACE)" configure --with-ghc="$$($1_$2_HC_CONFIG)" --with-ghc-pkg="$$($1_$2_GHC_PKG)" --with-gcc="$$(WhatGccIsCalled)" --configure-option=--with-cc="$$(WhatGccIsCalled)" $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) -- $2 $1 + "$$(GHC_CABAL_INPLACE)" configure --with-ghc="$$($1_$2_HC_CONFIG)" --with-ghc-pkg="$$($1_$2_GHC_PKG)" $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) -- $2 $1 ifeq "$$($1_$2_PROG)" "" ifneq "$$($1_$2_REGISTER_PACKAGE)" "NO" "$$($1_$2_GHC_PKG)" update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config |