diff options
| -rw-r--r-- | ghc.mk | 6 | ||||
| -rw-r--r-- | mk/config.mk.in | 2 | ||||
| -rw-r--r-- | rts/ghc.mk | 4 | ||||
| -rw-r--r-- | rules/build-package-data.mk | 6 | ||||
| -rw-r--r-- | rules/haddock.mk | 4 | ||||
| -rw-r--r-- | rules/manual-package-config.mk | 4 | ||||
| -rw-r--r-- | rules/package-config.mk | 4 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 6 | ||||
| -rw-r--r-- | utils/ghc-pkg/ghc.mk | 2 |
9 files changed, 19 insertions, 19 deletions
@@ -889,7 +889,7 @@ install_packages: rts/package.conf.install $(call installLibsTo, $(wildcard libraries/$p/dist-install/build/*.so libraries/$p/dist-install/build/*.dll libraries/$p/dist-install/build/*.dylib), "$(DESTDIR)$(topdir)/$p-$(libraries/$p_dist-install_VERSION)")) $(foreach p, $(INSTALL_PACKAGES), \ $(call make-command, \ - "$(GHC_CABAL_INPLACE)" copy \ + "$(ghc-cabal_INPLACE)" copy \ "$(STRIP_CMD)" \ $p $(INSTALL_DISTDIR_$p) \ '$(DESTDIR)' \ @@ -899,7 +899,7 @@ install_packages: rts/package.conf.install "$(INSTALLED_GHC_PKG_REAL)" --force --global-package-db "$(INSTALLED_PACKAGE_CONF)" update rts/package.conf.install $(foreach p, $(INSTALL_PACKAGES), \ $(call make-command, \ - "$(GHC_CABAL_INPLACE)" register \ + "$(ghc-cabal_INPLACE)" register \ "$(INSTALLED_GHC_REAL)" \ "$(INSTALLED_GHC_PKG_REAL)" \ "$(DESTDIR)$(topdir)" \ @@ -984,7 +984,7 @@ unix-binary-dist-prep: echo "BUILD_DOCBOOK_PS = $(BUILD_DOCBOOK_PS)" >> $(BIN_DIST_MK) echo "BUILD_DOCBOOK_PDF = $(BUILD_DOCBOOK_PDF)" >> $(BIN_DIST_MK) echo "BUILD_MAN = $(BUILD_MAN)" >> $(BIN_DIST_MK) - echo "GHC_CABAL_INPLACE = utils/ghc-cabal/dist-install/build/tmp/ghc-cabal-bindist" >> $(BIN_DIST_MK) + echo "ghc-cabal_INPLACE = utils/ghc-cabal/dist-install/build/tmp/ghc-cabal-bindist" >> $(BIN_DIST_MK) echo "UseSystemLibFFI = $(UseSystemLibFFI)" >> $(BIN_DIST_MK) cd $(BIN_DIST_PREP_DIR) && autoreconf $(call removeFiles,$(BIN_DIST_PREP_TAR)) diff --git a/mk/config.mk.in b/mk/config.mk.in index c43612f709..1488a5a4f9 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -441,8 +441,6 @@ SPLIT = $(INPLACE_LIB)/$(GHC_SPLIT_PGM) UNLIT = $(INPLACE_LIB)/$(GHC_UNLIT_PGM) TOUCHY = $(INPLACE_LIB)/touchy$(exeext) MKDIRHIER = $(INPLACE_BIN)/mkdirhier -GHC_CABAL_INPLACE = $(INPLACE_BIN)/ghc-cabal$(exeext) -GHC_PKG_INPLACE = $(INPLACE_BIN)/ghc-pkg$(exeext) GENERATED_FILE = chmod a-w EXECUTABLE_FILE = chmod +x diff --git a/rts/ghc.mk b/rts/ghc.mk index cc22c0518d..3dc3990dcc 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -73,8 +73,8 @@ rts_H_FILES += $(DTRACEPROBES_H) endif # collect the -l flags that we need to link the rts dyn lib. -rts/libs.depend : $(GHC_PKG_INPLACE) - "$(GHC_PKG_INPLACE)" field rts extra-libraries \ +rts/libs.depend : $$(ghc-pkg_INPLACE) + "$(ghc-pkg_INPLACE)" field rts extra-libraries \ | sed -e 's/^extra-libraries: //' -e 's/\([a-z0-9]*\)[ ]*/-l\1 /g' > $@ 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 diff --git a/rules/haddock.mk b/rules/haddock.mk index 4ef0fb1c6e..7efb29aa7d 100644 --- a/rules/haddock.mk +++ b/rules/haddock.mk @@ -43,9 +43,9 @@ ifneq "$$(BINDIST)" "YES" # We need the quadruple dollars for the dependencies, as it isn't # guaranteed that we are processing the packages in dependency order, # so we don't want to expand it yet. -$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_FILE) : $$(INPLACE_BIN)/haddock$$(exeext) $$(GHC_CABAL_INPLACE) $$($1_$2_HS_SRCS) $$$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_DEPS) | $$$$(dir $$$$@)/. +$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_FILE) : $$(INPLACE_BIN)/haddock$$(exeext) $$$$(ghc-cabal_INPLACE) $$($1_$2_HS_SRCS) $$$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_DEPS) | $$$$(dir $$$$@)/. ifeq "$$(HSCOLOUR_SRCS)" "YES" - "$$(GHC_CABAL_INPLACE)" hscolour $2 $1 + "$$(ghc-cabal_INPLACE)" hscolour $2 $1 endif "$$(TOP)/$$(INPLACE_BIN)/haddock" \ --odir="$1/$2/doc/html/$$($1_PACKAGE)" \ diff --git a/rules/manual-package-config.mk b/rules/manual-package-config.mk index 568d70887b..da6b3b61d9 100644 --- a/rules/manual-package-config.mk +++ b/rules/manual-package-config.mk @@ -15,7 +15,7 @@ define manual-package-config # args: $1 = dir $(call trace, manual-package-config($1)) $(call profStart, manual-package-config($1)) -$1/package.conf.inplace : $1/package.conf.in $$(GHC_PKG_INPLACE) +$1/package.conf.inplace : $1/package.conf.in $$$$(ghc-pkg_INPLACE) $$(CPP) $$(RAWCPP_FLAGS) -P \ -DTOP='"$$(TOP)"' \ $$($1_PACKAGE_CPP_OPTS) \ @@ -23,7 +23,7 @@ $1/package.conf.inplace : $1/package.conf.in $$(GHC_PKG_INPLACE) grep -v '^#pragma GCC' $$@.raw | \ sed -e 's/""//g' -e 's/:[ ]*,/: /g' > $$@ - "$$(GHC_PKG_INPLACE)" update --force $$@ + "$$(ghc-pkg_INPLACE)" update --force $$@ # This is actually a real file, but we need to recreate it on every # "make install", so we declare it as phony diff --git a/rules/package-config.mk b/rules/package-config.mk index a49ab9862a..664769409c 100644 --- a/rules/package-config.mk +++ b/rules/package-config.mk @@ -43,8 +43,8 @@ else $1_$2_HC_PKGCONF = $1_$2_HC_CONFIG = $$(TOP)/$$(GHC_STAGE1) $1_$2_HC_CONFIG_DEP = $$(GHC_STAGE1) -$1_$2_GHC_PKG = $$(TOP)/$$(GHC_PKG_INPLACE) -$1_$2_GHC_PKG_DEP = $$(GHC_PKG_INPLACE) +$1_$2_GHC_PKG = $$(TOP)/$$(ghc-pkg_INPLACE) +$1_$2_GHC_PKG_DEP = $$$$(ghc-pkg_INPLACE) $1_$2_GHC_PKG_OPTS = # If stage is not 0 then we always use stage1 for making .depend, as later # stages aren't available early enough 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 |