projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak Windows phase ordering
[ghc-hetmet.git]
/
ghc.mk
diff --git
a/ghc.mk
b/ghc.mk
index
7853aff
..
dd170bd
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-638,6
+638,10
@@
$(foreach lib,$(STAGE0_PACKAGES),$(eval \
libraries/$(lib)_dist-boot_CONFIGURE_PHASE = 1))
compiler_stage1_CONFIGURE_PHASE = 1
ghc_stage1_CONFIGURE_PHASE = 1
libraries/$(lib)_dist-boot_CONFIGURE_PHASE = 1))
compiler_stage1_CONFIGURE_PHASE = 1
ghc_stage1_CONFIGURE_PHASE = 1
+driver/ghc_dist_CONFIGURE_PHASE = 1
+driver/ghci_dist_CONFIGURE_PHASE = 1
+driver/haddock_dist_CONFIGURE_PHASE = 1
+utils/touchy_dist_CONFIGURE_PHASE = 1
# In phase 2, the phase 1 things actually get built
# In phase 2, the phase 1 things actually get built
@@
-738,11
+742,7
@@
$(eval $(call build-package,libraries/bin-package-db,dist-boot,0))
fixed_pkg_prev=
$(foreach pkg,$(STAGE0_PACKAGES),$(eval $(call fixed_pkg_dep,$(pkg),dist-boot)))
fixed_pkg_prev=
$(foreach pkg,$(STAGE0_PACKAGES),$(eval $(call fixed_pkg_dep,$(pkg),dist-boot)))
-compiler/stage1/package-data.mk : \
- libraries/Cabal/dist-boot/package-data.mk \
- libraries/hpc/dist-boot/package-data.mk \
- libraries/extensible-exceptions/dist-boot/package-data.mk \
- libraries/bin-package-db/dist-boot/package-data.mk
+compiler/stage1/package-data.mk : $(fixed_pkg_prev)
# Make sure we have all the GHCi libs by the time we've built
# ghc-stage2. DPH includes a bit of Template Haskell which needs the
# Make sure we have all the GHCi libs by the time we've built
# ghc-stage2. DPH includes a bit of Template Haskell which needs the