Mercurial > hg > release > icedtea8-forest-3.0 > jdk

changeset 10718:cf999ba47c04

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8071710: [solaris] libfontmanager should be linked against headless awt library Reviewed-by: ihse, erikj
author prr
date Thu, 29 Jan 2015 09:59:57 -0800
parents 1e4d444a20e2
children aa861c627760
files make/lib/Awt2dLibraries.gmk
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/lib/Awt2dLibraries.gmk	Thu Jan 29 14:59:42 2015 +0000
+++ b/make/lib/Awt2dLibraries.gmk	Thu Jan 29 09:59:57 2015 -0800
@@ -827,8 +827,8 @@
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \
     LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
-    LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
-    LDFLAGS_SUFFIX_aix := -lawt -lawt_xawt $(LIBM) $(LIBCXX) -ljava -ljvm,\
+    LDFLAGS_SUFFIX_solaris := -lawt -lawt_headless -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
+    LDFLAGS_SUFFIX_aix := -lawt -lawt_headless $(LIBM) $(LIBCXX) -ljava -ljvm,\
     LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
         -ljava -ljvm, \
     LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \