X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=72985607a0331f12283d8133740d8a0bf5d1db7b;hb=65691f95b3727c277a24ec5f0d5a4058c9a681e2;hp=2b5252a5befc8cbd33fa3b9783a268d2333d2e0c;hpb=9d7da331989abcd1844e9d03b8d1e4163796fa85;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 2b5252a..7298560 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -408,7 +408,7 @@ 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
+SRC_HC_OPTS += -threaded
 
 ALL_DIRS += ghci
 
@@ -557,11 +557,14 @@ ifeq "$(bootstrapped)" "YES"
 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
-
+utils/Encoding_HC_OPTS		+= -O
+utils/StringBuffer_HC_OPTS	+= -O
+utils/FastString_HC_OPTS	+= -O
 
 # ---- Profiling ----
 #simplCore/Simplify_HC_OPTS = -auto-all
@@ -752,6 +755,9 @@ VERSION = $(ProjectVersion)
 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