make/launcher/Launcher-jdk.pack.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 71,81 ****
    UNPACK_MAPFILE := $(UNPACK_MAPFILE_PLATFORM_FILE)
  else
    UNPACK_MAPFILE := $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200
  endif
  
! $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \
      SRC := $(UNPACKEXE_SRC), \
      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
      OPTIMIZATION := LOW, \
      CFLAGS := $(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE) -DFULL, \
      CFLAGS_release := -DPRODUCT, \
--- 71,83 ----
    UNPACK_MAPFILE := $(UNPACK_MAPFILE_PLATFORM_FILE)
  else
    UNPACK_MAPFILE := $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200
  endif
  
! $(eval $(call SetupNativeCompilation, BUILD_UNPACKEXE, \
!     NAME := unpack200, \
!     TYPE := EXECUTABLE, \
      SRC := $(UNPACKEXE_SRC), \
      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
      OPTIMIZATION := LOW, \
      CFLAGS := $(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE) -DFULL, \
      CFLAGS_release := -DPRODUCT, \
*** 89,99 ****
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS := $(UNPACKEXE_LIBS) $(LIBCXX), \
      LIBS_solaris :=  -lc, \
      OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpackexe, \
      OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_cmds/$(MODULE), \
-     PROGRAM := unpack200, \
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
      RC_FLAGS := $(RC_FLAGS) \
          -D "JDK_FNAME=unpack200.exe" \
          -D "JDK_INTERNAL_NAME=unpack200" \
          -D "JDK_FTYPE=0x1L", \
--- 91,100 ----