INSTALL_FLAGS = --enable-shell-wrappers
endif
-boot:
- @:
+boot:: boot.stage.$(stage)
-all:: build.stage$(stage)
+all:: build.stage.$(stage)
+
+rebuild ::
+ -$(CABAL) clean --distpref dist-stage$(stage)
+ $(RM) -rf stage$(stage)-inplace
+ $(MAKE) boot all
stage1 ::
$(MAKE) stage=1
clean distclean::
-$(CABAL) clean --distpref dist-stage1
-$(CABAL) clean --distpref dist-stage2
+ -$(CABAL) clean --distpref dist-stage3
$(RM) -rf stage1-inplace
$(RM) -rf stage2-inplace
+ $(RM) -rf stage3-inplace
-# XXX Eugh, can we do this better? The problem is making extra-gcc-opts
-# infdable on both Linux and Windows. I guess this will go away when we
-# drop the mangler?
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-SET_DATA_SUBDIR = --datasubdir=.
-INPLACE_DATA_DIR = '$$prefix'
-else
-SET_DATA_SUBDIR =
-INPLACE_DATA_DIR = '$$prefix/data'
-endif
+# XXX This should be defined somewhere more central
+INPLACE_DATA_DIR = $(FPTOOLS_TOP_ABS)/inplace-datadir
-build.stage1:
- $(CABAL) configure --distpref dist-stage1 \
- --flags=-ghci \
- $(SET_DATA_SUBDIR) \
- $(INSTALL_DIRS_CONFIGURE_FLAGS) \
- $(USE_BOOT_CONFIGURE_FLAGS) \
- $(COMMON_CONFIGURE_FLAGS)
- $(CABAL) build --distpref dist-stage1 $(BUILD_FLAGS)
- $(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' 'XXX/package.conf' "" \
- $(FPTOOLS_TOP_ABS)/ghc/stage1-inplace \
- $(FPTOOLS_TOP_ABS)/ghc/stage1-inplace \
- '$$prefix/bin' \
- '$$prefix/lib' \
- '$$prefix/libexec' \
- '$$prefix/dynlib' \
- $(INPLACE_DATA_DIR) \
- '$$prefix/doc' \
- '$$prefix/html' \
- '$$prefix/haddock' \
- --distpref dist-stage1 \
- $(INSTALL_FLAGS)
+CONFIGURE_FLAGS_STAGE1 += --flags=-ghci
ifeq "$(GhcWithInterpreter)" "YES"
CONFIGURE_FLAGS_STAGE2 += --flags=ghci
CONFIGURE_FLAGS_STAGE2 += --ghc-option=-threaded
endif
-# XXX In stage2 we should really use the inplace ghc-pkg
+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)
+
+# Allow EXTRA_HC_OPTS to be used from the command line to add options
+# when building (e.g. -v)
+BUILD_FLAGS=$(patsubst %, --ghc-option=%, $(EXTRA_HC_OPTS))
+
+# XXX In stage2+ we should really use the inplace ghc-pkg
# It works because installPackage doesn't actually use ghc-pkg, as there's
# no library to register
-build.stage2:
- $(CABAL) configure --distpref dist-stage2 \
- $(SET_DATA_SUBDIR) \
- $(CONFIGURE_FLAGS_STAGE2) \
+boot.stage.%:
+ $(CABAL) configure --distpref dist-stage$* \
$(INSTALL_DIRS_CONFIGURE_FLAGS) \
- $(USE_STAGE1_CONFIGURE_FLAGS) \
- $(COMMON_CONFIGURE_FLAGS)
- $(CABAL) build --distpref dist-stage2 $(BUILD_FLAGS)
+ $(CONFIGURE_FLAGS_STAGE$*) \
+ $(COMMON_CONFIGURE_FLAGS) \
+ --libsubdir=. \
+ --datadir='$$libdir' \
+ --datasubdir=.
+
+build.stage.%:
+ $(CABAL) build --distpref dist-stage$* $(BUILD_FLAGS)
$(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' 'XXX/package.conf' "" \
- $(FPTOOLS_TOP_ABS)/ghc/stage2-inplace \
- $(FPTOOLS_TOP_ABS)/ghc/stage2-inplace \
- '$$prefix/bin' \
- '$$prefix/lib' \
- '$$prefix/libexec' \
- '$$prefix/dynlib' \
- $(INPLACE_DATA_DIR) \
- '$$prefix/doc' \
- '$$prefix/html' \
- '$$prefix/haddock' \
- --distpref dist-stage2 \
+ $(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace \
+ $(FPTOOLS_TOP_ABS)/ghc/stage$*-inplace \
+ '$$prefix' \
+ '$(INPLACE_DATA_DIR)' \
+ '$$prefix/libexec' \
+ '$$prefix/dynlib' \
+ '$(INPLACE_DATA_DIR)' \
+ '$$prefix/doc' \
+ '$$prefix/html' \
+ '$$prefix/haddock' \
+ --distpref dist-stage$* \
+ $(INSTALL_FLAGS)
+
+# XXX For now we always install the stage 2 compiler
+install:
+ $(INSTALL_PACKAGE) install UNUSED UNUSED '$(DESTDIR)' '$(prefix)' \
+ '$(prefix)' '$(bindir)' '$(libdir)' \
+ '$(libexecdir)' '$(dynlibdir)' '$(libdir)' \
+ '$(docdir)' '$(htmldir)' '$(haddockdir)' \
+ --distpref dist-stage2 \
$(INSTALL_FLAGS)
# XXX fix: