make/lib/Awt2dLibraries.gmk

*** 649,672 ****
          hidevf w_novirtualdescr arrowrtn2, \
      DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \
      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_aix := -lawt_headless,\
      LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
          $(WIN_AWT_LIB), \
  ))
  
  $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
  
  ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
    $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
  endif
  
  ifeq ($(FREETYPE_TO_USE), bundled)
    $(BUILD_LIBFONTMANAGER): $(BUILD_LIBFREETYPE)
  endif
  
  TARGETS += $(BUILD_LIBFONTMANAGER)
--- 649,677 ----
          hidevf w_novirtualdescr arrowrtn2, \
      DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \
      LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
      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 \
          $(WIN_AWT_LIB), \
  ))
  
  $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
  
  ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix))
    $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS)
  endif
  
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+   $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_LWAWT)
+ endif
+ 
  ifeq ($(FREETYPE_TO_USE), bundled)
    $(BUILD_LIBFONTMANAGER): $(BUILD_LIBFREETYPE)
  endif
  
  TARGETS += $(BUILD_LIBFONTMANAGER)