diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-03-03 20:20:06 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-03 20:20:06 +0000 |
| commit | 480ad0369c51879060f56fe77003e10e4da6b141 (patch) | |
| tree | d3e2d1a2405e07fdfa9babd6b7dc3c7c205685c4 /rules/build-package-data.mk | |
| parent | 1da6975add0b333027f2b643933a4b60f0f66095 (diff) | |
| download | haskell-480ad0369c51879060f56fe77003e10e4da6b141.tar.gz | |
Use more of the automatically generated INPLACE variables
Diffstat (limited to 'rules/build-package-data.mk')
| -rw-r--r-- | rules/build-package-data.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 41f7a02be1..0380f7c5e5 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -99,16 +99,16 @@ $1/$2/build/autogen/cabal_macros.h : $1/$2/package-data.mk # This rule configures the package, generates the package-data.mk file # 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) +$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) # Checking packages built with the bootstrapping compiler would # generally be a waste of time. Either we will rebuild them with # stage1/stage2, or we don't really care about them. ifneq "$3" "0" ifneq "$$($1_NO_CHECK)" "YES" - "$$(GHC_CABAL_INPLACE)" check $1 + "$$(ghc-cabal_INPLACE)" check $1 endif endif - "$$(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 + "$$(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" $$(call cmd,$1_$2_GHC_PKG) update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config |