X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=utils%2FMakefile;fp=utils%2FMakefile;h=de44f17c0cb2eebac597e3fb13b5595ef5dde961;hp=660f1799d87084c1527454f2e67fff6854e3ffce;hb=346369d8f79c94a79bcea0d9e3ef140e683dd3eb;hpb=73f77be09896b041dc77ce31b349a89267e662c6 diff --git a/utils/Makefile b/utils/Makefile index 660f179..de44f17 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -69,6 +69,10 @@ endif # 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 +DO_NOT_INSTALL = pwd + binary-dist: $(foreach P,$(WITH_STAGE2),binary-dist.$P) ifeq "$(WHERE_AM_I)" "" echo "I don't know where I am" >&2 @@ -87,7 +91,7 @@ with-bootstrapping-compiler: \ 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.%: