X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=2b5252a5befc8cbd33fa3b9783a268d2333d2e0c;hb=9d7da331989abcd1844e9d03b8d1e4163796fa85;hp=68348ef063dd696b63a7eb495a388e62783af583;hpb=f6ee30fe81adf6bf7914c89cf60974c34b781c59;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 68348ef..2b5252a 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -390,7 +390,7 @@ else ifneq "$(findstring $(stage), 2 3)" "" bootstrapped = YES else -bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt) -a $(GhcPatchLevel) -ge $(ProjectPatchLevel)); then echo YES; else echo NO; fi) +bootstrapped = $(shell if (test $(GhcCanonVersion) -eq $(ProjectVersionInt) -a $(GhcPatchLevel) -eq $(ProjectPatchLevel)); then echo YES; else echo NO; fi) endif endif @@ -407,6 +407,9 @@ ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES" SRC_HC_OPTS += -DGHCI -package template-haskell PKG_DEPENDS += template-haskell +# Use threaded RTS with GHCi, so threads don't get blocked at the prompt. +# SRC_HC_OPTS += -threaded + ALL_DIRS += ghci # If we are going to use dynamic libraries instead of .o files for ghci, @@ -733,6 +736,7 @@ endif # typecheck/TcUnify_HC_OPTS += -auto-all coreSyn/CorePrep_HC_OPTS += -auto-all +# parser/Parser_HC_OPTS += -fasm #----------------------------------------------------------------------------- # Building the GHC package