change of representation for GenCmm, GenCmmTop, CmmProc

[ghc-hetmet.git] / compiler / Makefile

diff --git a/compiler/Makefile b/compiler/Makefile
index 67962bc..dd96bff 100644 (file)
--- 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)