X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=aac594d3e9778cbad026766bb6d3ed248c4118b2;hb=ec0b859902e717c24addff49f9a83efb927fb669;hp=6c83f9cd8c3a5652881c465efda5dda15cf0e107;hpb=27218ba74f28c527e0b3e88195169b6949d98899;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 6c83f9c..aac594d 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -413,18 +413,22 @@ ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
 
 # Yes, include the interepreter, readline, and Template Haskell extensions
 SRC_HC_OPTS += -DGHCI -package template-haskell
-# -DBREAKPOINT causes a loop in stage2
-# SRC_HC_OPTS += -DGHCI -DBREAKPOINT -package template-haskell
 PKG_DEPENDS += template-haskell
 
+# Should the debugger commands be enabled?
+ifeq "$(GhciWithDebugger)" "YES"
+SRC_HC_OPTS += -DDEBUGGER
+endif
 # Should GHCI be building info tables in the TABLES_NEXT_TO_CODE style
 # or not?
 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 +730,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 +762,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) $< $@