[project @ 2003-03-27 22:35:28 by sof]

[ghc-hetmet.git] / ghc / compiler / Makefile

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 328b926..3440b84 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -347,9 +347,6 @@ endif
 #      The standard suffix rule for compiling a Haskell file
 #      adds these flags to the command line
 
-# not sure if this is required --SDM
-main/Main_HC_OPTS              = -fvia-C
-
 prelude/PrimOp_HC_OPTS                 = -no-recomp -H80m
 
 # because the NCG can't handle the 64-bit math in here
@@ -383,8 +380,14 @@ utils/Binary_HC_OPTS               += -fvia-C
 endif
 
 # ByteCodeItbls uses primops that the NCG doesn't support yet.
-ghci/ByteCodeItbls_HC_OPTS     = -fvia-C
-ghci/ByteCodeLink_HC_OPTS      = -fvia-C -monly-3-regs
+ghci/ByteCodeItbls_HC_OPTS     += -fvia-C
+ghci/ByteCodeLink_HC_OPTS      += -fvia-C -monly-3-regs
+
+# BinIface and Binary take ages to both compile and run if you don's use -O
+main/BinIface_HC_OPTS          += -O
+utils/Binary_HC_OPTS           += -O
+utils/FastMutInt_HC_OPTS       += -O
+
 
 # CSE interacts badly with top-level IORefs (reportedly in DriverState and
 # DriverMkDepend), causing some of them to be commoned up.  We have a fix for
@@ -408,6 +411,9 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 main/SysTools_HC_OPTS          += '-\#include <windows.h>' '-\#include <process.h>'
 endif
 
+# Required due to use of Concurrent.myThreadId
+utils/Panic_HC_OPTS += -fvia-C
+
 # ghc_strlen percolates through so many modules that it is easier to get its
 # prototype via a global option instead of a myriad of per-file OPTIONS
 SRC_HC_OPTS += '-\#include "hschooks.h"'
@@ -427,7 +433,6 @@ PRIMOP_BITS=primop-data-decl.hs-incl \
             primop-needs-wrapper.hs-incl  \
             primop-can-fail.hs-incl  \
             primop-strictness.hs-incl  \
-            primop-usage.hs-incl  \
             primop-primop-info.hs-incl
 
 CLEAN_FILES += prelude/primops.txt
@@ -437,7 +442,7 @@ SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional
 SRC_CPP_OPTS += ${GhcCppOpts}
 
 ifneq "$(BootingFromHc)" "YES"
-prelude/PrimOp.lhs prelude/PrimOp.o: $(PRIMOP_BITS)
+prelude/PrimOp.lhs $(odir)/prelude/PrimOp.o: $(PRIMOP_BITS)
 endif
 
 ifneq "$(BootingFromHc)" "YES"
@@ -462,11 +467,14 @@ primop-can-fail.hs-incl: prelude/primops.txt
        $(GENPOC) --can-fail           < $< > $@
 primop-strictness.hs-incl: prelude/primops.txt
        $(GENPOC) --strictness         < $< > $@
-primop-usage.hs-incl: prelude/primops.txt
-       $(GENPOC) --usage              < $< > $@
 primop-primop-info.hs-incl: prelude/primops.txt
        $(GENPOC) --primop-primop-info < $< > $@
 
+# Usages aren't used any more; but the generator 
+# can still generate them if we want them back
+primop-usage.hs-incl: prelude/primops.txt
+       $(GENPOC) --usage              < $< > $@
+
 
 
 # ----------------------------------------------------------------------------