parsec is required to be a core package, genprimopcode uses it

[ghc-hetmet.git] / compiler / Makefile

diff --git a/compiler/Makefile b/compiler/Makefile
index e2d42aa..e82adc8 100644 (file)
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -396,7 +396,7 @@ else
 ifneq "$(findstring $(stage), 2 3)" ""
 bootstrapped = YES
 else
-bootstrapped = $(shell if (test $(GhcCanonVersion) -eq $(ProjectVersionInt) -a $(GhcPatchLevel) -eq $(ProjectPatchLevel)); then echo YES; else echo NO; fi)
+bootstrapped = NO
 endif
 endif
 
@@ -567,18 +567,14 @@ utils/Digraph_HC_OPTS             = -fglasgow-exts
 
 basicTypes/SrcLoc_HC_OPTS      = -funbox-strict-fields
 
-ifeq "$(bootstrapped)" "YES"
-utils/Binary_HC_OPTS           = -funbox-strict-fields
-endif
-
 # 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/Binary_HC_OPTS           += -O -funbox-strict-fields
 utils/FastMutInt_HC_OPTS       += -O
 utils/Encoding_HC_OPTS         += -O
-utils/StringBuffer_HC_OPTS     += -O
-utils/FastString_HC_OPTS       += -O
+utils/StringBuffer_HC_OPTS     += -O -funbox-strict-fields
+utils/FastString_HC_OPTS       += -O -funbox-strict-fields
 
 # ---- Profiling ----
 #simplCore/Simplify_HC_OPTS = -auto-all