Merged compiler warnings build refs, added -Wmissing-field-initialize…

…rs flag. Change on 2015/12/11 by tball <[email protected]> ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=110000733
haxwagon · Dec 14, 2015 · 7b3d28e · 7b3d28e
1 parent d1e531b
commit 7b3d28e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/inject/javax_inject/environment.mk b/inject/javax_inject/environment.mk
@@ -30,9 +30,7 @@ CLASSES_DIR = $(BUILD_DIR)/classes
 INJECT_SRC_JAR = $(JAVA_DEPS_JAR_DIR)/$(JAVAX_INJECT_SOURCE_JAR)
 INJECT_JAR_FULL = $(JAVA_DEPS_JAR_DIR)/$(JAVAX_INJECT_JAR)
 
-WARNINGS = -Wall -Werror
-
-OBJCFLAGS := -ObjC $(WARNINGS) $(DEBUGFLAGS)
+OBJCFLAGS := $(CC_WARNINGS) $(DEBUGFLAGS)
 
 # J2ObjC settings
 J2OBJC = $(DIST_DIR)/j2objc -classpath $(INJECT_JAR_FULL) -d $(BUILD_DIR)

diff --git a/jre_emul/environment.mk b/jre_emul/environment.mk
@@ -123,8 +123,7 @@ TEST_SRC = $(subst $(eval) ,:,$(TEST_SRC_ROOTS))
 vpath %.java $(JRE_SRC):$(TEST_SRC):$(STUBS_DIR)
 
 # Clang warnings
-WARNINGS := $(WARNINGS) -Wall -Werror -Wshorten-64-to-32 -Wsign-compare \
-  -Wno-unused-variable
+WARNINGS := $(CC_WARNINGS) $(WARNINGS)
 
 ifeq ("$(strip $(XCODE_VERSION_MAJOR))", "0500")
 OBJCFLAGS += -DSET_MIN_IOS_VERSION

diff --git a/jsr305/environment.mk b/jsr305/environment.mk
@@ -30,9 +30,7 @@ CLASSES_DIR = $(BUILD_DIR)/classes
 JSR305_SRC_JAR = $(JAVA_DEPS_JAR_DIR)/$(JSR305_SOURCE_JAR)
 JSR305_JAR_FULL = $(JAVA_DEPS_JAR_DIR)/$(JSR305_JAR)
 
-WARNINGS := -Wall -Werror
-
-OBJCFLAGS := -ObjC $(WARNINGS) $(DEBUGFLAGS)
+OBJCFLAGS := $(CC_WARNINGS) $(DEBUGFLAGS)
 
 # J2ObjC settings
 J2OBJC = $(DIST_DIR)/j2objc -classpath $(JSR305_JAR_FULL) -d $(BUILD_DIR)

diff --git a/make/common.mk b/make/common.mk
@@ -94,6 +94,9 @@ endif
 endif
 DEBUGFLAGS := $(DEBUGFLAGS) -O$(OPTIMIZATION_LEVEL)
 
+CC_WARNINGS = -Wall -Werror -Wshorten-64-to-32 \
+  -Wmissing-field-initializers -Wno-unused-variable
+
 ifdef GCC_PREPROCESSOR_DEFINITIONS
 DEBUGFLAGS += $(GCC_PREPROCESSOR_DEFINITIONS:%=-D%)
 endif

diff --git a/testing/mockito/environment.mk b/testing/mockito/environment.mk
@@ -37,9 +37,7 @@ SUPERSOURCE_ROOT = src/main/java
 MOCKITO_SOURCEPATH = $(SUPERSOURCE_ROOT):$(JAVA_SRC_DIR)
 MOCKITO_CLASSPATH = $(MOCKITO_JAR_PATH):$(JUNIT_JAR_PATH):$(HAMCREST_JAR_PATH)
 
-WARNINGS = -Wall -Werror
-
-OBJCFLAGS := -ObjC $(WARNINGS) $(DEBUGFLAGS)
+OBJCFLAGS := -ObjC $(CC_WARNINGS) $(DEBUGFLAGS)
 
 # J2ObjC settings
 J2OBJCC = $(ARCH_BIN_DIR)/j2objcc -c $(OBJCFLAGS) -I$(GEN_OBJC_DIR)