[project @ 2000-11-14 14:33:02 by simonmar]

[ghc-hetmet.git] / ghc / lib / std / Makefile

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 0ae5a89..5597c9c 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -41,7 +41,7 @@ endif
 #-----------------------------------------------------------------------------
 #      Setting the GHC compile options
 
-SRC_HC_OPTS += -recomp -cpp -fglasgow-exts-no-lang -fvia-C -Rghc-timing $(GhcLibHcOpts) $(PACKAGE)
+SRC_HC_OPTS += -recomp -cpp -fvia-C -fglasgow-exts $(GhcLibHcOpts) $(PACKAGE)
 ifneq "$(DLLized)" "YES"
 SRC_HC_OPTS += -static
 endif
@@ -59,21 +59,41 @@ endif
 
 # Far too much heap is needed to compile PrelNumExtra with -O at the
 # moment, but there you go..
-PrelNumExtra_HC_OPTS     += -H24m -K2m
-
-PrelPack_HC_OPTS        += -K4m
-PrelBase_HC_OPTS         += -H12m
-PrelRead_HC_OPTS         += -H20m
-PrelTup_HC_OPTS          += -H12m -K2m
-PrelNum_HC_OPTS                 += -H12m -K4m
-PrelArr_HC_OPTS          += -H8m
-PrelHandle_HC_OPTS       += -H20m
-Time_HC_OPTS             += -H24m -K2m
-Complex_HC_OPTS          += -H10m
-IO_HC_OPTS              += -H12m
-List_HC_OPTS             += -H8m
-Directory_HC_OPTS        += -H8m
-
+<<<<<<< Makefile
+# PrelNumExtra_HC_OPTS     += -H24m -K2m
+# 
+# PrelPack_HC_OPTS      += -K4m
+# PrelBase_HC_OPTS         += -H12m
+# PrelRead_HC_OPTS         += -H20m
+# PrelTup_HC_OPTS          += -H12m -K2m
+# PrelNum_HC_OPTS               += -H12m -K4m
+# PrelArr_HC_OPTS          += -H8m
+# PrelHandle_HC_OPTS       += -H20m
+# Time_HC_OPTS             += -H24m -K2m
+# Complex_HC_OPTS          += -H10m
+# IO_HC_OPTS            += -H12m
+# List_HC_OPTS             += -H8m
+# Directory_HC_OPTS        += -H8m
+=======
+PrelNumExtra_HC_OPTS     += +RTS -H24m -K2m -RTS
+>>>>>>> 1.50
+
+<<<<<<< Makefile
+=======
+PrelPack_HC_OPTS        += +RTS -K4m -RTS
+PrelBase_HC_OPTS         += +RTS -H12m -RTS
+PrelRead_HC_OPTS         += +RTS -H20m -RTS
+PrelTup_HC_OPTS          += +RTS -H12m -K2m -RTS
+PrelNum_HC_OPTS                 += +RTS -H12m -K4m -RTS
+PrelArr_HC_OPTS          += +RTS -H8m -RTS
+PrelHandle_HC_OPTS       += +RTS -H20m -RTS
+Time_HC_OPTS             += +RTS -H24m -K2m -RTS
+Complex_HC_OPTS          += +RTS -H10m -RTS
+IO_HC_OPTS              += +RTS -H12m -RTS
+List_HC_OPTS             += +RTS -H8m -RTS
+Directory_HC_OPTS        += +RTS -H8m -RTS
+
+>>>>>>> 1.50
 #-----------------------------------------------------------------------------
 #      Dependency generation