projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve error report for pattern guards
[ghc-hetmet.git]
/
ghc
/
compiler
/
Makefile
diff --git
a/ghc/compiler/Makefile
b/ghc/compiler/Makefile
index
68348ef
..
0c877ce
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,
@@
-554,11
+557,14
@@
ifeq "$(bootstrapped)" "YES"
utils/Binary_HC_OPTS = -funbox-strict-fields
endif
utils/Binary_HC_OPTS = -funbox-strict-fields
endif
-# BinIface and Binary take ages to both compile and run if you don's use -O
+# We always optimise some low-level modules, otherwise performance of
+# a non-optimised compiler is severely affected.
main/BinIface_HC_OPTS += -O
utils/Binary_HC_OPTS += -O
utils/FastMutInt_HC_OPTS += -O
main/BinIface_HC_OPTS += -O
utils/Binary_HC_OPTS += -O
utils/FastMutInt_HC_OPTS += -O
-
+utils/Encoding_HC_OPTS += -O
+utils/StringBuffer_HC_OPTS += -O
+utils/FastString_HC_OPTS += -O
# ---- Profiling ----
#simplCore/Simplify_HC_OPTS = -auto-all
# ---- Profiling ----
#simplCore/Simplify_HC_OPTS = -auto-all
@@
-674,7
+680,11
@@
$(odir)/ghc-inplace : $(HS_PROG)
ghc-inplace : stage1/ghc-inplace
$(LN_S) -f $< $@
ghc-inplace : stage1/ghc-inplace
$(LN_S) -f $< $@
-CLEAN_FILES += $(odir)/ghc-inplace ghc-inplace
+ifeq "$(stage)" "1"
+CLEAN_FILES += ghc-inplace
+endif
+
+CLEAN_FILES += $(odir)/ghc-inplace
#-----------------------------------------------------------------------------
# install
#-----------------------------------------------------------------------------
# install
@@
-733,6
+743,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
@@
-748,6
+759,9
@@
VERSION = $(ProjectVersion)
PKG_DEPENDS += base haskell98
PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(PKG_DEPENDS)'
PKG_DEPENDS += base haskell98
PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(PKG_DEPENDS)'
+# Omit Main from the library, the client will want to plug their own Main in
+LIBOBJS = $(filter-out $(odir)/main/Main.o $(odir)/parser/hschooks.o, $(OBJS))
+
# disable splitting: it won't really help with GHC, and the specialised
# build system for ghc/compiler isn't set up to handle it.
SplitObjs = NO
# disable splitting: it won't really help with GHC, and the specialised
# build system for ghc/compiler isn't set up to handle it.
SplitObjs = NO