[project @ 2003-06-27 18:28:31 by sof]

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

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index e0ddf89..4e0f5b7 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -235,7 +235,7 @@ CLEAN_FILES += $(CONFIG_HS)
 ALL_DIRS = \
   utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
   specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \
-  profiling parser cprAnalysis compMan ndpFlatten
+  profiling parser cprAnalysis compMan ndpFlatten cbits
 
 # Make sure we include Config.hs even if it doesn't exist yet...
 ALL_SRCS += $(CONFIG_HS)
@@ -368,7 +368,6 @@ ifeq "$(HOSTPLATFORM)" "hppa1.1-hp-hpux9"
 rename/RnMonad_HC_OPTS                 =  -O2 -O2-for-C
 endif
 
-utils/StringBuffer_HC_OPTS     = -fvia-C -fno-prune-tydecls
 utils/Digraph_HC_OPTS          = -fglasgow-exts 
 
 ifeq "$(bootstrapped)" "YES"
@@ -439,7 +438,7 @@ PRIMOP_BITS=primop-data-decl.hs-incl \
 CLEAN_FILES += prelude/primops.txt
 CLEAN_FILES += $(PRIMOP_BITS)
 
-SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional
+SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR)
 SRC_CPP_OPTS += ${GhcCppOpts}
 
 ifneq "$(BootingFromHc)" "YES"
@@ -481,7 +480,7 @@ primop-usage.hs-incl: prelude/primops.txt
 # ----------------------------------------------------------------------------
 #              Parsers/lexers
 
-SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS  $(GHC_HAPPY_OPTS)
+SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS
 
 #-----------------------------------------------------------------------------
 #              Linking