Fix CodingStyle#Warnings URLs

[ghc-hetmet.git] / compiler / Makefile

diff --git a/compiler/Makefile b/compiler/Makefile
index b7e9986..3e14087 100644 (file)
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -165,6 +165,10 @@ 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))))
 
@@ -218,6 +222,7 @@ boot :: $(CONFIG_HS)
 $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
        @$(RM) -f $(CONFIG_HS)
        @echo "Creating $(CONFIG_HS) ... "
+       @echo "{-# OPTIONS -w #-}" >>$(CONFIG_HS)
        @echo "module Config where" >>$(CONFIG_HS)
        @echo "cProjectName          = \"$(ProjectName)\"" >> $(CONFIG_HS)
        @echo "cProjectVersion       = \"$(ProjectVersion)\"" >> $(CONFIG_HS)
@@ -229,6 +234,8 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk
        @echo "cSplitObjs            = \"$(SplitObjs)\"" >> $(CONFIG_HS)
        @echo "cGhcWithInterpreter   = \"$(GhcWithInterpreter)\"" >> $(CONFIG_HS)
        @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS)
+       @echo "cGhcWithSMP           = \"$(GhcWithSMP)\"" >> $(CONFIG_HS)
+       @echo "cGhcRTSWays           = \"$(GhcRTSWays)\"" >> $(CONFIG_HS)
        @echo "cGhcUnregisterised    = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS)
        @echo "cGhcEnableTablesNextToCode = \"$(GhcEnableTablesNextToCode)\"" >> $(CONFIG_HS)
        @echo "cLeadingUnderscore    = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS)
@@ -260,6 +267,7 @@ endif
        @echo "cUSER_WAY_NAMES       = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS)
        @echo "cUSER_WAY_OPTS        = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS)
        @echo "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS)
+       @echo "cDocDir               = \"$(docdir)\""         >> $(CONFIG_HS)
        @echo done.
 
 CLEAN_FILES += $(CONFIG_HS)
@@ -810,7 +818,7 @@ endif
 # typecheck/TcType_HC_OPTS += -auto-all
 # typecheck/TcUnify_HC_OPTS += -auto-all
 
-coreSyn/CorePrep_HC_OPTS += -auto-all
+# coreSyn/CorePrep_HC_OPTS += -auto-all
 # parser/Parser_HC_OPTS += -fasm
 
 #-----------------------------------------------------------------------------