diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-01-30 11:19:03 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-01-30 11:19:03 +0000 |
| commit | 9fff25eaf08016c4c0e32a7087a1249d586550c0 (patch) | |
| tree | 7a2f13260f24d610abea5cd8f8bf3a51d0787c54 /rules/build-package-data.mk | |
| parent | 4ff3a642fbb61cf329d468993e9f732940f9f680 (diff) | |
| download | haskell-9fff25eaf08016c4c0e32a7087a1249d586550c0.tar.gz | |
Improve support for cross-compilation
Patchset from Stephen Blackheath <stephen.blackheath@ipwnstudios.com>
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 fd267b0347..d535e34cbe 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -79,7 +79,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) $$(LAX_DEPS_FOLLOW) $$($1_$2_HC_CONFIG_DEP) - "$$(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 + CROSS_COMPILE="$(CrossCompilePrefix)" "$$(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 |