jdk/make/launcher/Launcher-jdk.runtime.gmk

*** 40,50 ****
  
  UNPACKEXE_SRC := $(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \
      $(JDK_TOPDIR)/src/jdk.runtime/share/native/unpack200
  UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \
      -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
!     -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava
  
  ifeq ($(USE_EXTERNAL_LIBZ), true)
    UNPACKEXE_CFLAGS += -DSYSTEM_ZLIB
    UNPACKEXE_ZIPOBJS := -lz
  else
--- 40,50 ----
  
  UNPACKEXE_SRC := $(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \
      $(JDK_TOPDIR)/src/jdk.runtime/share/native/unpack200
  UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \
      -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
!     -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava
  
  ifeq ($(USE_EXTERNAL_LIBZ), true)
    UNPACKEXE_CFLAGS += -DSYSTEM_ZLIB
    UNPACKEXE_ZIPOBJS := -lz
  else
*** 100,110 ****
      CFLAGS_solaris := -KPIC, \
      CFLAGS_macosx := -fPIC, \
      MAPFILE := $(UNPACK_MAPFILE),\
      LDFLAGS := $(UNPACKEXE_ZIPOBJS), \
      LDFLAGS_windows := $(CXXFLAGS_JDKEXE), \
!     LDFLAGS_posix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
          $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_linux := -lc, \
      LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
      LDFLAGS_SUFFIX := $(LIBCXX), \
--- 100,110 ----
      CFLAGS_solaris := -KPIC, \
      CFLAGS_macosx := -fPIC, \
      MAPFILE := $(UNPACK_MAPFILE),\
      LDFLAGS := $(UNPACKEXE_ZIPOBJS), \
      LDFLAGS_windows := $(CXXFLAGS_JDKEXE), \
!     LDFLAGS_unix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
          $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_linux := -lc, \
      LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
      LDFLAGS_SUFFIX := $(LIBCXX), \