Add comments about pruning implication constraints

[ghc-hetmet.git] / compiler / Makefile

diff --git a/compiler/Makefile b/compiler/Makefile
index c77dc5f..70a0e72 100644 (file)
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -423,8 +423,10 @@ ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
 SRC_HC_OPTS += -DGHCI_TABLES_NEXT_TO_CODE
 endif
 
+ifneq "$(GhcNotThreaded)" "YES"
 # Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
 SRC_HC_OPTS += -threaded
+endif
 
 ALL_DIRS += ghci
 
@@ -726,6 +728,10 @@ all :: $(odir)/ghc-inplace ghc-inplace
 #   (On other system, -W isn't a pwd flag at all.)
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+all :: $(odir)/ghc-inplace.bat ghc-inplace.bat
+endif
+
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 #      MSys (...and cygwin with a mingw toolchain)
 SCRIPT_SHELL = $(shell cd /bin; pwd -W 2>/dev/null || echo "/bin")/sh
 else
@@ -754,6 +760,13 @@ $(odir)/ghc-inplace : $(GHC_PROG)
 # Re exec, see note 2 above
        chmod 755 $@
 
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ghc-inplace.bat $(odir)/ghc-inplace.bat: $(GHC_PROG)
+       @$(RM) $@
+       echo '@call $(subst /,\,$(GHC_COMPILER_DIR_ABS)/$(GHC_PROG)) -B$(FPTOOLS_TOP_ABS_PLATFORM) %*' >> $@
+       chmod 755 $@
+endif  
+
 ghc-inplace : stage1/ghc-inplace
        $(RM) -f $@ && $(LN_S) $< $@
 
@@ -858,6 +871,9 @@ HS_IFACES   = $(addsuffix .$(way_)hi,$(basename $(HS_OBJS)))
 # Haddock can't handle recursive modules currently, so we disable it for now.
 NO_HADDOCK_DOCS = YES
 
+# Tell package.mk not to set $(HC)
+NO_SET_HC = YES
+
 # The stage 2 GHC binary itself is built by  compiling main/Main.hs 
 # (the same as used in stage 1) against the GHC package.
 #