# HG changeset patch
# User prr
# Date 1517419254 28800
# Node ID c832897a3a234abefe0eb4a0a21f1008d23a9a8c
# Parent  2f4fe7776a539972725e907f7bf0e713bf38f92b
8196509: Linux UI applications broken by the build change for JDK-8196218
Reviewed-by: serb

diff -r 2f4fe7776a53 -r c832897a3a23 make/lib/Awt2dLibraries.gmk
--- a/make/lib/Awt2dLibraries.gmk	Fri Jan 26 16:45:08 2018 +0100
+++ b/make/lib/Awt2dLibraries.gmk	Wed Jan 31 09:20:54 2018 -0800
@@ -683,13 +683,13 @@
         hidevf w_novirtualdescr arrowrtn2, \
     DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \
     MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \
-    LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
+    LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
     LDFLAGS_macosx := -undefined dynamic_lookup, \
     LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
     LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
-    LIBS_linux := -lawt_headless -lc, \
+    LIBS_linux := -lc, \
     LIBS_solaris := -lawt_headless -lc, \
     LIBS_aix := -lawt_headless,\
     LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
@@ -719,7 +719,7 @@
 
 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
 
-ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix linux))
+ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
 endif