Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
8248563: Gtest CFLAGS/warnings is not properly handled
Reviewed-by: erikj
  • Loading branch information
magicus committed Jun 30, 2020
1 parent f567358 commit 2a37607e9833e43cfa5ee91925fbf4fdfd28dec3
Showing 1 changed file with 4 additions and 5 deletions.
@@ -38,7 +38,6 @@ endif

################################################################################

# Disabling all warnings in gtest source code

$(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBGTEST, \
NAME := gtest, \
@@ -50,8 +49,9 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBGTEST, \
$(GTEST_FRAMEWORK_SRC)/googletest/src \
$(GTEST_FRAMEWORK_SRC)/googlemock/src, \
INCLUDE_FILES := gtest-all.cc gmock-all.cc, \
CFLAGS := $(filter-out $(WARNING_CFLAGS_JVM), $(JVM_CFLAGS)) \
-w \
DISABLED_WARNINGS_gcc := undef unused-result format-nonliteral, \
DISABLED_WARNINGS_clang := undef unused-result format-nonliteral, \
CFLAGS := $(JVM_CFLAGS) \
-I$(GTEST_FRAMEWORK_SRC)/googletest \
-I$(GTEST_FRAMEWORK_SRC)/googletest/include \
-I$(GTEST_FRAMEWORK_SRC)/googlemock \
@@ -81,8 +81,7 @@ else
$(call create-mapfile)
endif

# Disabling undef, switch, format-nonliteral and tautological-undefined-compare
# warnings for clang because of test source.
# Additional disabled warnings are due to code in the test source.

$(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBJVM, \
NAME := jvm, \

0 comments on commit 2a37607

Please sign in to comment.