X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=c96b6adc6e40c8062297b52a0aa4ef4aa592a30c;hb=e8b2fe5550ee87ee6d6dce1aaffa50558da6f8e3;hp=8cbd489630c30c721ce16f73a0db80480ef858c0;hpb=30d7641901d6c4f82255c58f8425eddeb6c66dab;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 8cbd489..c96b6ad 100644
--- 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)
@@ -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