remove Haddock-lexing/parsing/renaming from GHC

[ghc-hetmet.git] / compiler / ghc.mk

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 59b451d..e8c487f 100644 (file)
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -51,6 +51,8 @@ $(compiler_CONFIG_HS) : mk/config.mk mk/project.mk
        @echo "cBooterVersion        = \"$(GhcVersion)\"" >> $@
        @echo "cStage                :: String" >> $@
        @echo "cStage                = show (STAGE :: Int)" >> $@
+       @echo "cIntegerLibrary       :: String" >> $@
+       @echo "cIntegerLibrary       = \"$(INTEGER_LIBRARY)\"" >> $@
        @echo "cSplitObjs            :: String" >> $@
        @echo "cSplitObjs            = \"$(SupportsSplitObjs)\"" >> $@
        @echo "cGhcWithInterpreter   :: String" >> $@
@@ -462,6 +464,7 @@ $(eval $(call compiler-hs-dependency,PrimOp,$(PRIMOP_BITS)))
 ifneq "$(ProjectPatchLevel)" "0"
 compiler/stage1/inplace-pkg-config-munged: compiler/stage1/inplace-pkg-config
        sed -e 's/^\(version: .*\)\.$(ProjectPatchLevel)$$/\1/' \
+           -e 's/^\(id: .*\)\.$(ProjectPatchLevel)$$/\1/' \
            -e 's/^\(hs-libraries: HSghc-.*\)\.$(ProjectPatchLevel)$$/\1/' \
          < $< > $@
        "$(compiler_stage1_GHC_PKG)" update --force $(compiler_stage1_GHC_PKG_OPTS) $@