1--- jdk/make/lib/Awt2dLibraries.gmk.orig 2019-04-17 23:24:06.000000000 -0700 2+++ jdk/make/lib/Awt2dLibraries.gmk 2019-04-18 11:22:47.195832000 -0700 3@@ -1190,7 +1190,7 @@ 4 else ifeq ($(OPENJDK_TARGET_OS), bsd) 5 LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include 6 ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd) 7- LIBSPLASHSCREEN_CFLAGS += -DLIBICONV_PLUG 8+ LIBSPLASHSCREEN_CFLAGS += %%ICONV_CPPFLAGS%% 9 endif 10 else ifeq ($(OPENJDK_TARGET_OS), windows) 11 LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32 12@@ -1212,7 +1212,7 @@ 13 -framework Cocoa \ 14 -framework JavaNativeFoundation 15 else ifeq ($(OPENJDK_TARGET_OS), bsd) 16- LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib -liconv -pthread 17+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) %%ICONV_LDFLAGS%% -pthread 18 else ifeq ($(OPENJDK_TARGET_OS), windows) 19 LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll 20 else # .. all other Unixes can use X_LIBS 21