make/lib/Awt2dLibraries.gmk

@  rev 48707 : 8196218: [linux] libfontmanager should be linked against headless awt library
|  Reviewed-by: duke
~

*** 687,697 ****
          $(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 := -lc, \
      LIBS_solaris := -lawt_headless -lc, \
      LIBS_aix := -lawt_headless,\
      LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
          $(WIN_AWT_LIB), \
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
--- 687,697 ----
          $(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_solaris := -lawt_headless -lc, \
      LIBS_aix := -lawt_headless,\
      LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
          $(WIN_AWT_LIB), \
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
*** 717,727 ****
  
  BUILD_LIBFONTMANAGER += $(INSTALL_LIBRARIES_HERE)/$(call SHARED_LIBRARY,fontmanager)
  
  $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
  
! ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
    $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
  endif
  
  TARGETS += $(BUILD_LIBFONTMANAGER)
  
--- 717,727 ----
  
  BUILD_LIBFONTMANAGER += $(INSTALL_LIBRARIES_HERE)/$(call SHARED_LIBRARY,fontmanager)
  
  $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
  
! ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix linux))
    $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
  endif
  
  TARGETS += $(BUILD_LIBFONTMANAGER)