projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
81e5f8f
)
Bootstrapping fixes
author
Ian Lynagh
<igloo@earth.li>
Sun, 17 May 2009 00:11:46 +0000
(
00:11
+0000)
committer
Ian Lynagh
<igloo@earth.li>
Sun, 17 May 2009 00:11:46 +0000
(
00:11
+0000)
ghc.mk
patch
|
blob
|
history
diff --git
a/ghc.mk
b/ghc.mk
index
fb6ba93
..
b12583a
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-329,6
+329,7
@@
endif
PACKAGES += haskeline
PACKAGES += haskeline
+ifneq "$(BootingFromHc)" "YES"
PACKAGES_STAGE2 += \
dph/dph-base \
dph/dph-prim-interface \
PACKAGES_STAGE2 += \
dph/dph-base \
dph/dph-prim-interface \
@@
-336,6
+337,7
@@
PACKAGES_STAGE2 += \
dph/dph-prim-par \
dph/dph-seq \
dph/dph-par
dph/dph-prim-par \
dph/dph-seq \
dph/dph-par
+endif
BOOT_PKGS = Cabal hpc extensible-exceptions
BOOT_PKGS = Cabal hpc extensible-exceptions
@@
-497,9
+499,12
@@
BUILD_DIRS += \
ifneq "$(CLEANING)" "YES"
BUILD_DIRS += \
ifneq "$(CLEANING)" "YES"
BUILD_DIRS += \
- $(patsubst %, libraries/%, $(PACKAGES) $(PACKAGES_STAGE2)) \
+ $(patsubst %, libraries/%, $(PACKAGES) $(PACKAGES_STAGE2))
+ifneq "$(BootingFromHc)" "YES"
+BUILD_DIRS += \
libraries/dph
endif
libraries/dph
endif
+endif
BUILD_DIRS += \
compiler \
BUILD_DIRS += \
compiler \