Commit a196ef83 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Only use STAGE3_PACKAGE_CONF for building GHC itself

In particular, when building dph with the stage2 compiler, we want to
register it in the main package.conf.
parent 70b76165
......@@ -188,6 +188,7 @@ CONFIGURE_FLAGS_STAGE3 = $(CONFIGURE_FLAGS_STAGE2)
CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS)
CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS)
CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
CONFIGURE_FLAGS_STAGE3 += --package-db $(STAGE3_PACKAGE_CONF)
# In a source dist we don't need to worry about Parser.y(.pp) as we have
# the .hs file pre-generated
......
......@@ -83,6 +83,7 @@ CONFIGURE_FLAGS_STAGE3 = $(CONFIGURE_FLAGS_STAGE2PLUS)
CONFIGURE_FLAGS_STAGE1 += $(USE_BOOT_CONFIGURE_FLAGS)
CONFIGURE_FLAGS_STAGE2 += $(USE_STAGE1_CONFIGURE_FLAGS)
CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
CONFIGURE_FLAGS_STAGE3 += --package-db $(STAGE3_PACKAGE_CONF)
CONFIGURE_FLAGS_STAGE1 += $(foreach flag, $(GhcStage1HcOpts), --ghc-option=$(flag))
CONFIGURE_FLAGS_STAGE2 += $(foreach flag, $(GhcStage2HcOpts), --ghc-option=$(flag))
......
......@@ -89,8 +89,7 @@ USE_STAGE1_CONFIGURE_FLAGS = \
USE_STAGE2_CONFIGURE_FLAGS = \
--with-compiler=$(GHC_STAGE2) \
$(USE_STAGE_CONFIGURE_FLAGS) \
--package-db $(STAGE3_PACKAGE_CONF)
$(USE_STAGE_CONFIGURE_FLAGS)
BUILD_FLAGS = $(addprefix --ghc-option=,$(SRC_HC_OPTS))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment