stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8248563: Gtest CFLAGS/warnings is not properly handled

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2020-07-01 01:56:52 +02:00
parent f5673586b7
commit 2a37607e98
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
make/hotspot/lib/CompileGtest.gmk
View File

@ -38,7 +38,6 @@ endif
################################################################################ ################################################################################
# Disabling all warnings in gtest source code
$(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBGTEST, \ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBGTEST, \
NAME := gtest, \ NAME := gtest, \
@ -50,8 +49,9 @@ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBGTEST, \
$(GTEST_FRAMEWORK_SRC)/googletest/src \ $(GTEST_FRAMEWORK_SRC)/googletest/src \
$(GTEST_FRAMEWORK_SRC)/googlemock/src, \ $(GTEST_FRAMEWORK_SRC)/googlemock/src, \
INCLUDE_FILES := gtest-all.cc gmock-all.cc, \ INCLUDE_FILES := gtest-all.cc gmock-all.cc, \
CFLAGS := $(filter-out $(WARNING_CFLAGS_JVM), $(JVM_CFLAGS)) \ DISABLED_WARNINGS_gcc := undef unused-result format-nonliteral, \
-w \ DISABLED_WARNINGS_clang := undef unused-result format-nonliteral, \
CFLAGS := $(JVM_CFLAGS) \
-I$(GTEST_FRAMEWORK_SRC)/googletest \ -I$(GTEST_FRAMEWORK_SRC)/googletest \
-I$(GTEST_FRAMEWORK_SRC)/googletest/include \ -I$(GTEST_FRAMEWORK_SRC)/googletest/include \
-I$(GTEST_FRAMEWORK_SRC)/googlemock \ -I$(GTEST_FRAMEWORK_SRC)/googlemock \
@ -81,8 +81,7 @@ else
$(call create-mapfile) $(call create-mapfile)
endif endif
# Disabling undef, switch, format-nonliteral and tautological-undefined-compare # Additional disabled warnings are due to code in the test source.
# warnings for clang because of test source.
$(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBJVM, \ $(eval $(call SetupJdkLibrary, BUILD_GTEST_LIBJVM, \
NAME := jvm, \ NAME := jvm, \