diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-07-03 22:46:33 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-07-03 22:46:33 +0000 |
| commit | eae65ca88fc09342e295874fb253f83775c61051 (patch) | |
| tree | 1fcab9d470cde6065b8fc8601f7fb2b867efd32f /mk | |
| parent | 37cc35d23202c9846e68e4c0a279fa75273f6f1c (diff) | |
| download | haskell-eae65ca88fc09342e295874fb253f83775c61051.tar.gz | |
Remove Cabal modules from compat
We now get them from the bootstrapping package.conf instead
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 4 | ||||
| -rw-r--r-- | mk/opts.mk | 5 | ||||
| -rw-r--r-- | mk/package.mk | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index e19a1cdc30..3749b3eda8 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -884,6 +884,8 @@ GHC_STAGE1 = $(GHC_COMPILER_DIR)/stage1/ghc-inplace -no-user-package-conf GHC_STAGE2 = $(GHC_COMPILER_DIR)/stage2/ghc-inplace -no-user-package-conf GHC_STAGE3 = $(GHC_COMPILER_DIR)/stage3/ghc-inplace -no-user-package-conf +BOOTSTRAPPING_CONF = $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf + # NOTE: add -no-user-package-conf for stage 1-3 above, so that # we avoid picking up any packages the user might happen to have # installed for this GHC version. They are bound to be incompatible @@ -912,6 +914,8 @@ else # not UseStage1 or BootingFromHc HC = @WithHc@ MKDEPENDHS = $(GHC) +BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS = -package-conf $(BOOTSTRAPPING_CONF) +BOOTSTRAPPING_PACKAGE_CONF_MKDEPENDHS_OPTS = -package-conf $(BOOTSTRAPPING_CONF) GhcVersion = @GhcVersion@ GhcPatchLevel = @GhcPatchLevel@ GhcMajVersion = @GhcMajVersion@ diff --git a/mk/opts.mk b/mk/opts.mk index fe2d06066b..08ec4b60a2 100644 --- a/mk/opts.mk +++ b/mk/opts.mk @@ -60,7 +60,7 @@ endif # All the standard gluing together, as in the comment right at the front -HC_OPTS = $(SRC_HC_OPTS) $(WAY$(_way)_HC_OPTS) $($*_HC_OPTS) $(EXTRA_HC_OPTS) +HC_OPTS = $(BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS) $(SRC_HC_OPTS) $(WAY$(_way)_HC_OPTS) $($*_HC_OPTS) $(EXTRA_HC_OPTS) HC_POST_OPTS = $(SRC_HC_POST_OPTS) $(WAY$(_way)_HC_POST_OPTS) $($*_HC_POST_OPTS) $(EXTRA_HC_POST_OPTS) HC_PRE_OPTS = $(SRC_HC_PRE_OPTS) $(WAY$(_way)_HC_PRE_OPTS) $($*_HC_PRE_OPTS) $(EXTRA_HC_PRE_OPTS) @@ -95,7 +95,8 @@ LIT2HTML_OPTS = $(SRC_LIT2HTML_OPTS) $(WAY$(_way)_LIT2HTML_OPTS) $(EXTRA_LI LIT2LATEX_OPTS = $(SRC_LIT2LATEX_OPTS) $(WAY$(_way)_LIT2LATEX_OPTS) $(EXTRA_LIT2LATEX_OPTS) LIT2PGM_OPTS = $(SRC_LIT2PGM_OPTS) $(WAY$(_way)_LIT2PGM_OPTS) $(EXTRA_LIT2PGM_OPTS) MKDEPENDC_OPTS = $(SRC_MKDEPENDC_OPTS) $(WAY$(_way)_MKDEPENDC_OPTS) $(EXTRA_MKDEPENDC_OPTS) -MKDEPENDHS_OPTS = $(SRC_MKDEPENDHS_OPTS) $(WAY$(_way)_MKDEPENDHS_OPTS) \ +MKDEPENDHS_OPTS = $(BOOTSTRAPPING_PACKAGE_CONF_MKDEPENDHS_OPTS) \ + $(SRC_MKDEPENDHS_OPTS) $(WAY$(_way)_MKDEPENDHS_OPTS) \ $(EXTRA_MKDEPENDHS_OPTS) MKDEPENDLIT_OPTS = $(SRC_MKDEPENDLIT_OPTS) $(WAY$(_way)_MKDEPENDLIT_OPTS) \ $(EXTRA_MKDEPENDLIT_OPTS) diff --git a/mk/package.mk b/mk/package.mk index f17f9e03e5..44087aa1c0 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -120,6 +120,7 @@ SRC_HSC2HS_OPTS += -I. ifneq "$(NO_SET_HC)" "YES" HC = $(GHC_INPLACE) +BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS = endif IGNORE_PACKAGE_FLAG = -package-name $(PACKAGE)-$(VERSION) |