diff options
| -rw-r--r-- | compiler/ghc.mk | 5 | ||||
| -rw-r--r-- | rules/build-package-data.mk | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 498e8dc8b8..70c95f3426 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -414,9 +414,14 @@ compiler_PACKAGE = ghc # when it gets registered; see Note [munge-stage1-package-config] # below. ifneq "$(ProjectPatchLevel)" "0" + define compiler_PACKAGE_MAGIC compiler_stage1_VERSION = $(subst .$(ProjectPatchLevel),,$(ProjectVersion)) endef + +# Don't register the non-munged package +compiler_stage1_REGISTER_PACKAGE = NO + endif # haddocking only happens for stage2 diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 81913dcc87..4fe60f9818 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -48,12 +48,14 @@ endif $1/$2/package-data.mk $1/$2/inplace-pkg-config $1/$2/build/autogen/cabal_macros.h : $$(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 ifeq "$$($1_$2_PROG)" "" +ifneq "$$($1_$2_REGISTER_PACKAGE)" "NO" ifeq "$$(ghc_ge_6102) $3" "NO 0" # NOTE [1] below cat $1/$2/inplace-pkg-config | sed "s@^import-dirs:@import-dirs: $(TOP)/$1 $(TOP)/$1/src @" | "$$($1_$2_GHC_PKG)" update --force $$($1_$2_GHC_PKG_OPTS) - else "$$($1_$2_GHC_PKG)" update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config endif endif +endif # [1] this is a hack for GHC <= 6.10.1. When making dependencies with # ghc -M, in GHC 6.10.1 and earlier, GHC needed to find either the .hi |