projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not link ghc stage1 using -threaded, only for stage2 or 3
[ghc-hetmet.git]
/
utils
/
Makefile
diff --git
a/utils/Makefile
b/utils/Makefile
index
660f179
..
84df51e
100644
(file)
--- a/
utils/Makefile
+++ b/
utils/Makefile
@@
-69,6
+69,11
@@
endif
# sort removes duplicates - we don't actually care about the order
WITH_EITHER = $(sort $(WITH_BOOTSTRAPPING_COMPILER) $(WITH_STAGE2))
# sort removes duplicates - we don't actually care about the order
WITH_EITHER = $(sort $(WITH_BOOTSTRAPPING_COMPILER) $(WITH_STAGE2))
+# We need to build pwd with stage 2, as it goes in bindists, but we
+# don't actually want to install it. Likewise the installPackage
+# program.
+DO_NOT_INSTALL = pwd installPackage
+
binary-dist: $(foreach P,$(WITH_STAGE2),binary-dist.$P)
ifeq "$(WHERE_AM_I)" ""
echo "I don't know where I am" >&2
binary-dist: $(foreach P,$(WITH_STAGE2),binary-dist.$P)
ifeq "$(WHERE_AM_I)" ""
echo "I don't know where I am" >&2
@@
-87,7
+92,7
@@
with-bootstrapping-compiler: \
with-stage-2: $(foreach P,$(WITH_STAGE2),with-stage-2.$P)
$(MAKE) -C haddock install-inplace
with-stage-2: $(foreach P,$(WITH_STAGE2),with-stage-2.$P)
$(MAKE) -C haddock install-inplace
-install:: $(foreach P,$(WITH_STAGE2),install.$P)
+install:: $(foreach P,$(filter-out $(DO_NOT_INSTALL),$(WITH_STAGE2)),install.$P)
$(foreach P,$(WITH_EITHER),clean.$P): \
clean.%:
$(foreach P,$(WITH_EITHER),clean.$P): \
clean.%: