Commit d30d47e5 authored by Simon Marlow's avatar Simon Marlow

Make builds that use stage1 use "dist-install" consistently. This

makes it easier to remove everything built with stage1 in cases where
the build system or GHC wrongly thinks everything is up to date.
parent e8832eb9
......@@ -439,13 +439,13 @@ ghc/stage2/package-data.mk: compiler/stage2/package-data.mk
# package-data.mk is sufficient, as that in turn depends on all the
# libraries
utils/haddock/dist/package-data.mk: compiler/stage2/package-data.mk
utils/ghc-pwd/dist/package-data.mk: compiler/stage2/package-data.mk
utils/ghc-pwd/dist-install/package-data.mk: compiler/stage2/package-data.mk
utils/ghc-cabal/dist-install/package-data.mk: compiler/stage2/package-data.mk
utils/ghc-pkg/dist-install/package-data.mk: compiler/stage2/package-data.mk
utils/hsc2hs/dist-install/package-data.mk: compiler/stage2/package-data.mk
utils/compare_sizes/dist/package-data.mk: compiler/stage2/package-data.mk
utils/runghc/dist/package-data.mk: compiler/stage2/package-data.mk
utils/compare_sizes/dist-install/package-data.mk: compiler/stage2/package-data.mk
utils/runghc/dist-install/package-data.mk: compiler/stage2/package-data.mk
# add the final two package.conf dependencies: ghc-prim depends on RTS,
# and RTS depends on libffi.
......@@ -910,7 +910,7 @@ $(eval $(call bindist,.,\
mk/config.mk.in \
$(INPLACE_BIN)/mkdirhier \
utils/ghc-cabal/dist-install/build/tmp/ghc-cabal \
utils/ghc-pwd/dist/build/tmp/ghc-pwd \
utils/ghc-pwd/dist-install/build/tmp/ghc-pwd \
$(BINDIST_WRAPPERS) \
$(BINDIST_PERL_SOURCES) \
$(BINDIST_LIBS) \
......
......@@ -2,7 +2,7 @@
utils/compare_sizes_USES_CABAL = YES
utils/compare_sizes_PACKAGE = compareSizes
utils/compare_sizes_MODULES = Main
utils/compare_sizes_dist_PROG = compareSizes$(exeext)
utils/compare_sizes_dist-install_PROG = compareSizes$(exeext)
$(eval $(call build-prog,utils/compare_sizes,dist,1))
$(eval $(call build-prog,utils/compare_sizes,dist-install,1))
utils/ghc-pwd_USES_CABAL = YES
utils/ghc-pwd_PACKAGE = ghc-pwd
utils/ghc-pwd_dist_PROG = ghc-pwd$(exeext)
utils/ghc-pwd_dist-install_PROG = ghc-pwd$(exeext)
$(eval $(call build-prog,utils/ghc-pwd,dist,1))
$(eval $(call build-prog,utils/ghc-pwd,dist-install,1))
......@@ -10,8 +10,8 @@
#
# -----------------------------------------------------------------------------
utils/ghctags_dist_MODULES = Main
utils/ghctags_dist_HC_OPTS = -package ghc
utils/ghctags_dist_INSTALL = NO
utils/ghctags_dist_PROG = ghctags$(exeext)
$(eval $(call build-prog,utils/ghctags,dist,2))
utils/ghctags_dist-install_MODULES = Main
utils/ghctags_dist-install_HC_OPTS = -package ghc
utils/ghctags_dist-install_INSTALL = NO
utils/ghctags_dist-install_PROG = ghctags$(exeext)
$(eval $(call build-prog,utils/ghctags,dist-install,2))
......@@ -10,10 +10,10 @@
#
# -----------------------------------------------------------------------------
utils/hpc_dist_MODULES = Main HpcCombine HpcDraft HpcFlags HpcLexer \
utils/hpc_dist-install_MODULES = Main HpcCombine HpcDraft HpcFlags HpcLexer \
HpcMarkup HpcOverlay HpcParser HpcReport \
HpcShowTix HpcUtils
utils/hpc_dist_HC_OPTS = -cpp -package hpc
utils/hpc_dist_INSTALL = YES
utils/hpc_dist_PROG = hpc$(exeext)
$(eval $(call build-prog,utils/hpc,dist,1))
utils/hpc_dist-install_HC_OPTS = -cpp -package hpc
utils/hpc_dist-install_INSTALL = YES
utils/hpc_dist-install_PROG = hpc$(exeext)
$(eval $(call build-prog,utils/hpc,dist-install,1))
......@@ -11,19 +11,19 @@
# -----------------------------------------------------------------------------
utils/runghc_PACKAGE = runghc
utils/runghc_dist_USES_CABAL = YES
utils/runghc_dist_PROG = runghc$(exeext)
utils/runghc_dist_SHELL_WRAPPER = YES
utils/runghc_dist_INSTALL_SHELL_WRAPPER = YES
utils/runghc_dist_EXTRA_HC_OPTS = -cpp -DVERSION="\"$(ProjectVersion)\""
utils/runghc_dist-install_USES_CABAL = YES
utils/runghc_dist-install_PROG = runghc$(exeext)
utils/runghc_dist-install_SHELL_WRAPPER = YES
utils/runghc_dist-install_INSTALL_SHELL_WRAPPER = YES
utils/runghc_dist-install_EXTRA_HC_OPTS = -cpp -DVERSION="\"$(ProjectVersion)\""
ifneq "$(BINDIST)" "YES"
# hack: the build system has trouble with Main modules not called Main.hs
utils/runghc/dist/build/Main.hs : utils/runghc/runghc.hs | $$(dir $$@)/.
utils/runghc/dist-install/build/Main.hs : utils/runghc/runghc.hs | $$(dir $$@)/.
"$(CP)" $< $@
endif
$(eval $(call build-prog,utils/runghc,dist,1))
$(eval $(call build-prog,utils/runghc,dist-install,1))
install: install_runhaskell
......
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