X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=70a0e723c5b140c41dcf9599b4f48f756c3772c6;hb=dfcbc18e016540cb136ec3298a07a4a55b488db0;hp=6c83f9cd8c3a5652881c465efda5dda15cf0e107;hpb=27218ba74f28c527e0b3e88195169b6949d98899;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index 6c83f9c..70a0e72 100644 --- 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) $< $@