MCONFIG: add MCONFIG.devel for use from git, removed in tarballs

Add an MCONFIG.devel file which is present in git, but removed in
tarballs.  This lets us set -Werror there and still not break users
who are using a different compiler.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --git a/MCONFIG b/MCONFIG
index 87079a5..c76b591 100644 (file)
--- a/MCONFIG
+++ b/MCONFIG
@@ -74,5 +74,9 @@ MAKEDEPS = -Wp,-MT,$@,-MD,$(dir $@).$(notdir $@).d
 # header files from the platform.
 UMAKEDEPS = -Wp,-MT,$@,-MMD,$(dir $@).$(notdir $@).d
 
+# Items that are only appropriate during development; this file is
+# removed when tarballs are generated.
+-include $(topdir)/MCONFIG.devel
+
 # Local additions, like -DDEBUG can go here
 -include $(topdir)/MCONFIG.local

diff --git a/MCONFIG.devel b/MCONFIG.devel
new file mode 100644 (file)
index 0000000..104207f
--- /dev/null
+++ b/MCONFIG.devel
@@ -0,0 +1,2 @@
+# Useful while doing development, but not for production.
+GCCWARN += -Wno-clobbered -Werror

diff --git a/Makefile.private b/Makefile.private
index ab9fee2..c70c204 100644 (file)
--- a/Makefile.private
+++ b/Makefile.private
@@ -17,7 +17,8 @@
 #
 .PHONY: official release
 
-PRIVATE = Makefile.private
+# These files are removed when tarballs are generated.
+PRIVATE = Makefile.private MCONFIG.devel
 
 GIT_DIR ?= .git
 ABS_GIT_DIR := $(shell cd '$(GIT_DIR)' 2>/dev/null && pwd)