equal
deleted
inserted
replaced
54 $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/inftrees$(OBJ_SUFFIX) \ |
54 $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/inftrees$(OBJ_SUFFIX) \ |
55 $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/inffast$(OBJ_SUFFIX) |
55 $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/inffast$(OBJ_SUFFIX) |
56 |
56 |
57 endif |
57 endif |
58 |
58 |
59 UNPACKEXE_LANG := C |
|
60 ifeq ($(OPENJDK_TARGET_OS), solaris) |
59 ifeq ($(OPENJDK_TARGET_OS), solaris) |
61 UNPACKEXE_LANG := C++ |
60 UNPACKEXE_TOOLCHAIN := TOOLCHAIN_LINK_CXX |
62 endif |
61 endif |
63 |
62 |
64 UNPACK_MAPFILE_DIR := $(JDK_TOPDIR)/make/mapfiles/libunpack |
63 UNPACK_MAPFILE_DIR := $(JDK_TOPDIR)/make/mapfiles/libunpack |
65 UNPACK_MAPFILE_PLATFORM_FILE := \ |
64 UNPACK_MAPFILE_PLATFORM_FILE := \ |
66 $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH) |
65 $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH) |
76 UNPACK_MAPFILE := $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200 |
75 UNPACK_MAPFILE := $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200 |
77 endif |
76 endif |
78 |
77 |
79 $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \ |
78 $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \ |
80 SRC := $(UNPACKEXE_SRC), \ |
79 SRC := $(UNPACKEXE_SRC), \ |
81 LANG := $(UNPACKEXE_LANG), \ |
80 TOOLCHAIN := $(UNPACKEXE_TOOLCHAIN), \ |
82 OPTIMIZATION := LOW, \ |
81 OPTIMIZATION := LOW, \ |
83 CFLAGS := $(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE) -DFULL, \ |
82 CFLAGS := $(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE) -DFULL, \ |
84 CFLAGS_release := -DPRODUCT, \ |
83 CFLAGS_release := -DPRODUCT, \ |
85 CFLAGS_linux := -fPIC, \ |
84 CFLAGS_linux := -fPIC, \ |
86 CFLAGS_solaris := -KPIC, \ |
85 CFLAGS_solaris := -KPIC, \ |