make/launcher/Launcher-jdk.runtime.gmk

*** 47,66 ****
  ifeq ($(USE_EXTERNAL_LIBZ), true)
    UNPACKEXE_CFLAGS += -DSYSTEM_ZLIB
    UNPACKEXE_ZIPOBJS := -lz
  else
    UNPACKEXE_CFLAGS += -I$(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8
!   UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \
!       $(JDK_OUTPUTDIR)/objs/libzip/deflate$(OBJ_SUFFIX) \
!       $(JDK_OUTPUTDIR)/objs/libzip/trees$(OBJ_SUFFIX) \
!       $(JDK_OUTPUTDIR)/objs/libzip/zadler32$(OBJ_SUFFIX) \
!       $(JDK_OUTPUTDIR)/objs/libzip/compress$(OBJ_SUFFIX) \
!       $(JDK_OUTPUTDIR)/objs/libzip/zutil$(OBJ_SUFFIX) \
!       $(JDK_OUTPUTDIR)/objs/libzip/inflate$(OBJ_SUFFIX) \
!       $(JDK_OUTPUTDIR)/objs/libzip/infback$(OBJ_SUFFIX) \
!       $(JDK_OUTPUTDIR)/objs/libzip/inftrees$(OBJ_SUFFIX) \
!       $(JDK_OUTPUTDIR)/objs/libzip/inffast$(OBJ_SUFFIX)
  
  endif
  
  UNPACKEXE_LANG := C
  ifeq ($(OPENJDK_TARGET_OS), solaris)
--- 47,66 ----
  ifeq ($(USE_EXTERNAL_LIBZ), true)
    UNPACKEXE_CFLAGS += -DSYSTEM_ZLIB
    UNPACKEXE_ZIPOBJS := -lz
  else
    UNPACKEXE_CFLAGS += -I$(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib-1.2.8
!   UNPACKEXE_ZIPOBJS := $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/zcrc32$(OBJ_SUFFIX) \
!       $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/deflate$(OBJ_SUFFIX) \
!       $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/trees$(OBJ_SUFFIX) \
!       $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/zadler32$(OBJ_SUFFIX) \
!       $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/compress$(OBJ_SUFFIX) \
!       $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/zutil$(OBJ_SUFFIX) \
!       $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/inflate$(OBJ_SUFFIX) \
!       $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/infback$(OBJ_SUFFIX) \
!       $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/inftrees$(OBJ_SUFFIX) \
!       $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/inffast$(OBJ_SUFFIX)
  
  endif
  
  UNPACKEXE_LANG := C
  ifeq ($(OPENJDK_TARGET_OS), solaris)
*** 106,117 ****
          $(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), \
!     OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
!     OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
      PROGRAM := unpack200, \
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
      RC_FLAGS := $(RC_FLAGS) \
          -D "JDK_FNAME=unpack200.exe" \
          -D "JDK_INTERNAL_NAME=unpack200" \
--- 106,117 ----
          $(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), \
!     OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe$(OUTPUT_SUBDIR), \
!     OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe$(OUTPUT_SUBDIR), \
      PROGRAM := unpack200, \
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
      RC_FLAGS := $(RC_FLAGS) \
          -D "JDK_FNAME=unpack200.exe" \
          -D "JDK_INTERNAL_NAME=unpack200" \
*** 131,147 ****
  
  # Build into object dir and copy executable afterwards to avoid .ilk file in
  # image. The real fix would be clean up linking of unpack200 using
  # -link -incremental:no
  # like all other launchers.
! $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX): $(BUILD_UNPACKEXE)
          $(call install-file)
  
! LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/unpack200$(EXE_SUFFIX)
  
  ################################################################################
- 
- jdk.runtime: $(LAUNCHERS)
- 
- all: jdk.runtime
- 
- .PHONY: all jdk.runtime
--- 131,141 ----
  
  # Build into object dir and copy executable afterwards to avoid .ilk file in
  # image. The real fix would be clean up linking of unpack200 using
  # -link -incremental:no
  # like all other launchers.
! $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE)/unpack200$(EXE_SUFFIX): $(BUILD_UNPACKEXE)
          $(call install-file)
  
! TARGETS += $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE)/unpack200$(EXE_SUFFIX)
  
  ################################################################################