X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=dd96bff2dda18dd2adde0e8a68ca1aef77d5811c;hb=16dc208aaad7aadaea970e47b8055d7d7f8781e5;hp=67962bc0fedf26118eb9be0a58c36b0297b78443;hpb=019ad00f4989b2e81d62c30c7a4de4aadc30ebdc;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 67962bc..dd96bff 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -165,9 +165,7 @@ odir=stage$(stage)
 
 SRC_HC_OPTS += $(patsubst %, -i$(odir)/%, $(ALL_DIRS))
 
-ifneq "$(stage)" "1"
 SRC_HC_OPTS += -Wall -fno-warn-name-shadowing
-endif
 
 HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS))))
 C_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(C_SRCS))))
@@ -222,7 +220,7 @@ boot :: $(CONFIG_HS)
 $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
 	@$(RM) -f $(CONFIG_HS)
 	@echo "Creating $(CONFIG_HS) ... "
-	@echo "{-# OPTIONS_GHC -w #-}" >>$(CONFIG_HS)
+	@echo "{-# OPTIONS -w #-}" >>$(CONFIG_HS)
 	@echo "module Config where" >>$(CONFIG_HS)
 	@echo "cProjectName          = \"$(ProjectName)\"" >> $(CONFIG_HS)
 	@echo "cProjectVersion       = \"$(ProjectVersion)\"" >> $(CONFIG_HS)