From c8d19293f256e686d5724c55a1cbb71ea5026fa5 Mon Sep 17 00:00:00 2001 From: Volker Simonis Date: Mon, 16 Apr 2018 16:43:26 +0200 Subject: [PATCH] 8201524: [AIX] Don't link libfontmanager against libawt_headless Reviewed-by: erikj, clanger, prr --- make/lib/Awt2dLibraries.gmk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk index 1229274869e..4b386d4ff23 100644 --- a/make/lib/Awt2dLibraries.gmk +++ b/make/lib/Awt2dLibraries.gmk @@ -652,9 +652,9 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ + LDFLAGS_aix := -Wl$(COMMA)-berok, \ LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ - LIBS_aix := -lawt_headless, \ LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \ -framework CoreGraphics, \ LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ @@ -663,10 +663,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \ $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT) -ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix)) - $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS) -endif - ifeq ($(OPENJDK_TARGET_OS), macosx) $(BUILD_LIBFONTMANAGER): $(call FindLib, java.desktop, awt_lwawt) endif