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 /utils | |
| parent | 1da6975add0b333027f2b643933a4b60f0f66095 (diff) | |
| download | haskell-480ad0369c51879060f56fe77003e10e4da6b141.tar.gz | |
Use more of the automatically generated INPLACE variables
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 6 | ||||
| -rw-r--r-- | utils/ghc-pkg/ghc.mk | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index c72f1a1a31..db125986b7 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -18,7 +18,9 @@ CABAL_DOTTED_VERSION := $(shell grep "^Version:" libraries/Cabal/Cabal/Cabal.cab CABAL_VERSION := $(subst .,$(comma),$(CABAL_DOTTED_VERSION)) CABAL_CONSTRAINT := --constraint="Cabal == $(CABAL_DOTTED_VERSION)" -$(GHC_CABAL_INPLACE) : utils/ghc-cabal/dist/build/tmp/ghc-cabal$(exeext) | $$(dir $$@)/. +ghc-cabal_INPLACE = inplace/bin/ghc-cabal$(exeext) + +$(ghc-cabal_INPLACE) : utils/ghc-cabal/dist/build/tmp/ghc-cabal$(exeext) | $$(dir $$@)/. "$(CP)" $< $@ utils/ghc-cabal/dist/build/tmp/ghc-cabal$(exeext): $(wildcard libraries/Cabal/Cabal/Distribution/*/*/*.hs) @@ -45,7 +47,7 @@ utils/ghc-cabal/dist/build/tmp/ghc-cabal$(exeext): utils/ghc-cabal/Main.hs $(TOU $(eval $(call clean-target,utils/ghc-cabal,dist,\ utils/ghc-cabal/dist bootstrapping)) -$(eval $(call all-target,utils/ghc-cabal,$(GHC_CABAL_INPLACE))) +$(eval $(call all-target,utils/ghc-cabal,$(ghc-cabal_INPLACE))) # ----------------------------------------------------------------------------- # Now make another copy that goes in bindists. This needs to be built diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk index e20949159f..4464ba1cde 100644 --- a/utils/ghc-pkg/ghc.mk +++ b/utils/ghc-pkg/ghc.mk @@ -47,7 +47,7 @@ utils/ghc-pkg_dist_INSTALL_INPLACE = YES $(eval $(call build-prog,utils/ghc-pkg,dist,0)) -$(GHC_PKG_INPLACE) : | $(INPLACE_PACKAGE_CONF)/. +$(ghc-pkg_INPLACE) : | $(INPLACE_PACKAGE_CONF)/. utils/ghc-pkg/dist/package-data.mk: \ utils/ghc-pkg/dist/build/Version.hs |