Make killThread# cmm primop use local stack allocation

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index ec55261..f51b9a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,17 +43,13 @@ endif
 
 include mk/custom-settings.mk
 
-PACKAGE_MK=libraries/base/ghc.mk
-$(PACKAGE_MK):
-       sh boot-pkgs
-
 # No need to update makefiles for these targets:
 REALGOALS=$(filter-out bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show,$(MAKECMDGOALS))
 
 # NB. not the same as saying '%: ...', which doesn't do the right thing:
 # it does nothing if we specify a target that already exists.
 .PHONY: $(REALGOALS)
-$(REALGOALS) all: $(PACKAGE_MK)
+$(REALGOALS) all:
        @echo "===--- updating makefiles phase 0"
        $(MAKE) -r --no-print-directory -f ghc.mk phase=0 just-makefiles
 ifneq "$(OMIT_PHASE_1)" "YES"
@@ -72,9 +68,14 @@ endif
        $(MAKE) -r --no-print-directory -f ghc.mk $@
 
 binary-dist:
+ifeq "$(mingw32_TARGET_OS)" "1"
+       $(MAKE) -r --no-print-directory -f ghc.mk windows-binary-dist
+       $(MAKE) -r --no-print-directory -f ghc.mk windows-installer
+else
        rm -f bindist-list
        $(MAKE) -r --no-print-directory -f ghc.mk bindist BINDIST=YES
        $(MAKE) -r --no-print-directory -f ghc.mk binary-dist
+endif
 
 clean distclean maintainer-clean:
        $(MAKE) -r --no-print-directory -f ghc.mk $@ CLEANING=YES
@@ -83,7 +84,7 @@ clean distclean maintainer-clean:
 $(filter clean_%, $(MAKECMDGOALS)) : clean_% :
        $(MAKE) -r --no-print-directory -f ghc.mk $@ CLEANING=YES
 
-bootstrapping-files show: $(PACKAGE_MK)
+bootstrapping-files show:
        $(MAKE) -r --no-print-directory -f ghc.mk $@
 
 ifeq "$(darwin_TARGET_OS)" "1"