623 DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \ |
623 DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \ |
624 LDFLAGS := $(subst -Xlinker -z -Xlinker defs,, \ |
624 LDFLAGS := $(subst -Xlinker -z -Xlinker defs,, \ |
625 $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK) \ |
625 $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK) \ |
626 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
626 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
627 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
627 LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ |
|
628 LDFLAGS_aix := -Wl$(COMMA)-berok, \ |
628 LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ |
629 LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ |
629 LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ |
630 LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ |
630 LIBS_aix := -lawt_headless, \ |
|
631 LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \ |
631 LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \ |
632 -framework CoreGraphics, \ |
632 -framework CoreGraphics, \ |
633 LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ |
633 LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ |
634 $(WIN_AWT_LIB), \ |
634 $(WIN_AWT_LIB), \ |
635 )) |
635 )) |
636 |
636 |
637 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT) |
637 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT) |
638 |
|
639 ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris aix)) |
|
640 $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_HEADLESS) |
|
641 endif |
|
642 |
638 |
643 ifeq ($(OPENJDK_TARGET_OS), macosx) |
639 ifeq ($(OPENJDK_TARGET_OS), macosx) |
644 $(BUILD_LIBFONTMANAGER): $(call FindLib, $(MODULE), awt_lwawt) |
640 $(BUILD_LIBFONTMANAGER): $(call FindLib, $(MODULE), awt_lwawt) |
645 endif |
641 endif |
646 |
642 |