jdk/make/launcher/Launcher-jdk.runtime.gmk
changeset 27799 097b1d6f6894
parent 27565 729f9700483a
parent 27772 a0a13701758d
child 28846 b96683be2713
equal deleted inserted replaced
27581:9fffb959eb41 27799:097b1d6f6894
    40 
    40 
    41 UNPACKEXE_SRC := $(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \
    41 UNPACKEXE_SRC := $(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \
    42     $(JDK_TOPDIR)/src/jdk.runtime/share/native/unpack200
    42     $(JDK_TOPDIR)/src/jdk.runtime/share/native/unpack200
    43 UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \
    43 UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \
    44     -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
    44     -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
    45     -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava
    45     -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava
    46 
    46 
    47 ifeq ($(USE_EXTERNAL_LIBZ), true)
    47 ifeq ($(USE_EXTERNAL_LIBZ), true)
    48   UNPACKEXE_CFLAGS += -DSYSTEM_ZLIB
    48   UNPACKEXE_CFLAGS += -DSYSTEM_ZLIB
    49   UNPACKEXE_ZIPOBJS := -lz
    49   UNPACKEXE_ZIPOBJS := -lz
    50 else
    50 else
    75   BUILD_UNPACKEXE_LDEXE := $(CC)
    75   BUILD_UNPACKEXE_LDEXE := $(CC)
    76   EXE_OUT_OPTION_save := $(EXE_OUT_OPTION)
    76   EXE_OUT_OPTION_save := $(EXE_OUT_OPTION)
    77   EXE_OUT_OPTION := -Fe
    77   EXE_OUT_OPTION := -Fe
    78   # With the current way unpack200 is built, debug symbols aren't supported
    78   # With the current way unpack200 is built, debug symbols aren't supported
    79   # anyway.
    79   # anyway.
    80   UNPACKEXE_DEBUG_SYMBOLS :=
    80   UNPACKEXE_DEBUG_SYMBOLS := false
    81 endif
    81 endif
    82 
    82 
    83 # The linker on older SuSE distros (e.g. on SLES 10) complains with:
    83 # The linker on older SuSE distros (e.g. on SLES 10) complains with:
    84 # "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
    84 # "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
    85 # if feeded with a version script which contains named tags.
    85 # if feeded with a version script which contains named tags.
   100     CFLAGS_solaris := -KPIC, \
   100     CFLAGS_solaris := -KPIC, \
   101     CFLAGS_macosx := -fPIC, \
   101     CFLAGS_macosx := -fPIC, \
   102     MAPFILE := $(UNPACK_MAPFILE),\
   102     MAPFILE := $(UNPACK_MAPFILE),\
   103     LDFLAGS := $(UNPACKEXE_ZIPOBJS), \
   103     LDFLAGS := $(UNPACKEXE_ZIPOBJS), \
   104     LDFLAGS_windows := $(CXXFLAGS_JDKEXE), \
   104     LDFLAGS_windows := $(CXXFLAGS_JDKEXE), \
   105     LDFLAGS_posix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
   105     LDFLAGS_unix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
   106         $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \
   106         $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \
   107         $(call SET_SHARED_LIBRARY_ORIGIN), \
   107         $(call SET_SHARED_LIBRARY_ORIGIN), \
   108     LDFLAGS_linux := -lc, \
   108     LDFLAGS_linux := -lc, \
   109     LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
   109     LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
   110     LDFLAGS_SUFFIX := $(LIBCXX), \
   110     LDFLAGS_SUFFIX := $(LIBCXX), \