--- old/make/lib/Awt2dLibraries.gmk 2019-11-12 23:41:42.098237600 +0900 +++ new/make/lib/Awt2dLibraries.gmk 2019-11-12 23:41:41.510109100 +0900 @@ -371,6 +371,16 @@ BUILD_LIBLCMS_INCLUDE_FILES := endif +BUILD_LIBLCMS_DISABLE_WARNINGS_gcc := format-nonliteral type-limits \ + misleading-indentation undef unused-function +ifeq ($(TOOLCHAIN_TYPE), gcc) + GCC_MAJOR_VER := $(shell $(ECHO) $(CC_VERSION_NUMBER) | $(CUT) -d . -f 1) + GCC_8_OR_LATER := $(shell [ $(GCC_MAJOR_VER) -ge 8 ] && echo true) + ifeq ($(GCC_8_OR_LATER), true) + BUILD_LIBLCMS_DISABLE_WARNINGS_gcc += stringop-truncation + endif +endif + $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \ NAME := lcms, \ INCLUDE_FILES := $(BUILD_LIBLCMS_INCLUDE_FILES), \ @@ -382,8 +392,7 @@ common/awt/debug \ libawt/java2d, \ HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \ - DISABLED_WARNINGS_gcc := format-nonliteral type-limits \ - misleading-indentation undef unused-function, \ + DISABLED_WARNINGS_gcc := $(BUILD_LIBLCMS_DISABLE_WARNINGS_gcc), \ DISABLED_WARNINGS_clang := tautological-compare format-nonliteral undef, \ DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ DISABLED_WARNINGS_microsoft := 4819, \