[project @ 2003-06-24 10:03:39 by simonmar]

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

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 8cbd489..a8afae0 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -109,7 +109,7 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
        done
 else
        for i in */*hi-boot*; do \
-           $(LN_S) -f ../../$$i stage$(stage)/$$i; \
+           $(LN_S) -f ../../$$i stage$(stage)/$$i || true ; \
        done
 endif
 
@@ -183,7 +183,7 @@ boot :: $(CONFIG_HS)
 
 $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
        @$(RM) -f $(CONFIG_HS)
-       @echo -n "Creating $(CONFIG_HS) ... "
+       @echo "Creating $(CONFIG_HS) ... "
        @echo "module Config where" >>$(CONFIG_HS)
        @echo "cProjectName          = \"$(ProjectName)\"" >> $(CONFIG_HS)
        @echo "cProjectVersion       = \"$(ProjectVersion)\"" >> $(CONFIG_HS)
@@ -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)
@@ -439,7 +439,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 +481,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