projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2006-01-06 16:30:17 by simonmar]
[ghc-hetmet.git]
/
ghc
/
compiler
/
Makefile
diff --git
a/ghc/compiler/Makefile
b/ghc/compiler/Makefile
index
68348ef
..
2b5252a
100644
(file)
--- a/
ghc/compiler/Makefile
+++ b/
ghc/compiler/Makefile
@@
-390,7
+390,7
@@
else
ifneq "$(findstring $(stage), 2 3)" ""
bootstrapped = YES
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
endif
endif
@@
-407,6
+407,9
@@
ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
SRC_HC_OPTS += -DGHCI -package template-haskell
PKG_DEPENDS += template-haskell
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,
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
# typecheck/TcUnify_HC_OPTS += -auto-all
coreSyn/CorePrep_HC_OPTS += -auto-all
+# parser/Parser_HC_OPTS += -fasm
#-----------------------------------------------------------------------------
# Building the GHC package
#-----------------------------------------------------------------------------
# Building the GHC package