clean distclean::
-$(CABAL) clean --distpref dist-stage1
-$(CABAL) clean --distpref dist-stage2
+ -$(CABAL) clean --distpref dist-stage3
$(RM) -f Makefile-stage1
$(RM) -f Makefile-stage2
+ $(RM) -f Makefile-stage3
$(RM) -f prelude/primops.txt
$(RM) -f $(PRIMOP_BITS)
$(RM) -f $(CONFIG_HS)
$(RM) -f parser/Parser.y
+ $(RM) -rf stage1 stage2plus
+ $(RM) -f $(STAGE3_PACKAGE_CONF)
CONFIGURE_FLAGS_STAGE1 += --flags=stage1
CONFIGURE_FLAGS_STAGE2 += --flags=-stage1
CONFIGURE_FLAGS_STAGE3 += $(USE_STAGE2_CONFIGURE_FLAGS)
boot.stage.%: $(PRIMOP_BITS) $(CONFIG_HS) parser/Parser.y
+ test -e $(STAGE3_PACKAGE_CONF) || echo "[]" > $(STAGE3_PACKAGE_CONF)
$(CABAL) configure --distpref dist-stage$* \
$(CONFIGURE_FLAGS_STAGE$*) \
$(INSTALL_DIRS_CONFIGURE_FLAGS) \
install:
@:
-stage_dirs :
- $(MKDIRHIER) stage$(stage)
-
-boot :: stage_dirs
-
# -----------------------------------------------------------------------------
# Create compiler configuration
#
PLATFORM_H = ghc_boot_platform.h
-stage1/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk
+stage1/$(PLATFORM_H) : $(FPTOOLS_TOP)/mk/config.mk
+ $(MKDIRHIER) stage1
@echo "Creating $@..."
@$(RM) $@
@echo "#ifndef __PLATFORM_H__" >$@
# For stage2 and above, the BUILD platform is the HOST of stage1, and
# the HOST platform is the TARGET of stage1. The TARGET remains the same
# (stage1 is the cross-compiler, not stage2).
-stage2/$(PLATFORM_H) : stage_dirs $(FPTOOLS_TOP)/mk/config.mk
+stage2plus/$(PLATFORM_H) : $(FPTOOLS_TOP)/mk/config.mk
+ $(MKDIRHIER) stage2plus
@echo "Creating $@..."
@$(RM) $@
@echo "#ifndef __PLATFORM_H__" >$@
@echo "#endif /* __PLATFORM_H__ */" >> $@
@echo "Done."
-STAGE_PLATFORM_H = stage$(stage)/$(PLATFORM_H)
+ifeq "$(stage)" "1"
+STAGE_PLATFORM_H = stage1/$(PLATFORM_H)
+else
+STAGE_PLATFORM_H = stage2plus/$(PLATFORM_H)
+endif
boot :: $(STAGE_PLATFORM_H)
CABAL = $(LIBRARIES_ABS)/cabal-bin $(GHC) $(LIBRARIES_ABS)/bootstrapping.conf
INSTALL_PACKAGE = \
$(UTILS_ABS)/installPackage/install-inplace/bin/installPackage
+STAGE3_PACKAGE_CONF = $(FPTOOLS_TOP_ABS)/stage3.package.conf
# We rely on all the CONFIGURE_ARGS being quoted with '...', and there
# being no 's inside the values.
--with-compiler=$(GHC_STAGE1) \
$(USE_STAGE_CONFIGURE_FLAGS)
-USE_STAGE2_CONFIGURE_FLAGS = \
- --with-compiler=$(GHC_STAGE2) \
- $(USE_STAGE_CONFIGURE_FLAGS)
+USE_STAGE2_CONFIGURE_FLAGS = \
+ --with-compiler=$(GHC_STAGE2) \
+ $(USE_STAGE_CONFIGURE_FLAGS) \
+ --package-db $(STAGE3_PACKAGE_CONF)
BUILD_FLAGS = $(addprefix --ghc-option=,$(SRC_HC_OPTS))
findPackages :: PackageDBStack -> PackageArg -> IO [InstalledPackageInfo]
findPackages db_stack pkgarg
= case [ p | p <- all_pkgs, pkgarg `matchesPkg` p ] of
- [] -> die ("cannot find package " ++ pkg_msg pkgarg)
+ [] -> dieWith 2 ("cannot find package " ++ pkg_msg pkgarg)
ps -> return ps
where
all_pkgs = allPackagesInStack db_stack
bye s = putStr s >> exitWith ExitSuccess
die :: String -> IO a
-die s = do
+die = dieWith 1
+
+dieWith :: Int -> String -> IO a
+dieWith ec s = do
hFlush stdout
prog <- getProgramName
hPutStrLn stderr (prog ++ ": " ++ s)
- exitWith (ExitFailure 1)
+ exitWith (ExitFailure ec)
dieOrForceAll :: Force -> String -> IO ()
dieOrForceAll ForceAll s = ignoreError s