813 # Turn off aliasing with GCC for ExtensionSubtables.cpp |
813 # Turn off aliasing with GCC for ExtensionSubtables.cpp |
814 ifeq ($(OPENJDK_TARGET_OS), linux) |
814 ifeq ($(OPENJDK_TARGET_OS), linux) |
815 BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing |
815 BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing |
816 endif |
816 endif |
817 |
817 |
|
818 # Libfontmanager doesn't actually need X_LIBS to link, but if building |
|
819 # on a Solaris machine without X installed, using a devkit, linking |
|
820 # to libawt_xawt will fail without the -L parameters from X_LIBS. Filter |
|
821 # out the -R parameters since they aren't needed. |
818 $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \ |
822 $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \ |
819 LIBRARY := fontmanager, \ |
823 LIBRARY := fontmanager, \ |
820 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
824 OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \ |
821 SRC := $(JDK_TOPDIR)/src/share/native/sun/font \ |
825 SRC := $(JDK_TOPDIR)/src/share/native/sun/font \ |
822 $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font, \ |
826 $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font, \ |
831 MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \ |
835 MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \ |
832 LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ |
836 LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ |
833 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
837 $(call SET_SHARED_LIBRARY_ORIGIN), \ |
834 LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \ |
838 LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \ |
835 LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ |
839 LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \ |
836 LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \ |
840 LDFLAGS_SUFFIX_solaris := $(filter-out -R%, $(X_LIBS)) \ |
|
841 -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \ |
837 LDFLAGS_SUFFIX_aix := -lawt -lawt_xawt $(LIBM) $(LIBCXX) -ljava -ljvm,\ |
842 LDFLAGS_SUFFIX_aix := -lawt -lawt_xawt $(LIBM) $(LIBCXX) -ljava -ljvm,\ |
838 LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \ |
843 LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \ |
839 -ljava -ljvm, \ |
844 -ljava -ljvm, \ |
840 LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ |
845 LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ |
841 $(WIN_AWT_LIB), \ |
846 $(WIN_AWT_LIB), \ |