Skip to content
Permalink
Browse files

Automatic merge of jdk:master into master

  • Loading branch information
duke committed Jul 28, 2020
2 parents 749c9d1 + 5b99c6a commit 1469e885ed6cd5eaa0a1250af525f89ffdbccda5
Showing with 1 addition and 1 deletion.
  1. +1 −1 make/modules/java.desktop/lib/Awt2dLibraries.gmk
@@ -561,7 +561,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
CFLAGS_windows = -DCC_NOEX, \
EXTRA_HEADER_DIRS := $(LIBFONTMANAGER_EXTRA_HEADER_DIRS), \
WARNINGS_AS_ERRORS_xlc := false, \
DISABLED_WARNINGS_gcc := sign-compare unused-function, \
DISABLED_WARNINGS_gcc := sign-compare unused-function int-to-pointer-cast, \
DISABLED_WARNINGS_clang := sign-compare, \
DISABLED_WARNINGS_microsoft := 4018 4146 4244 4996, \
LDFLAGS := $(subst -Xlinker -z -Xlinker defs,, \

0 comments on commit 1469e88

Please sign in to comment.