make/launcher/LauncherCommon.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
*** 181,190 ****
--- 181,192 ----
        $1_MAPFILE :=
      endif
    endif
  
    $$(eval $$(call SetupNativeCompilation, BUILD_LAUNCHER_$1, \
+       NAME := $1, \
+       TYPE := EXECUTABLE, \
        EXTRA_FILES := $(LAUNCHER_SRC)/main.c, \
        OPTIMIZATION := $$($1_OPTIMIZATION), \
        CFLAGS := $$($1_CFLAGS) \
            $(LAUNCHER_CFLAGS) \
            $(VERSION_CFLAGS) \
*** 209,219 ****
        LIBS_windows := $$($1_WINDOWS_JLI_LIB) \
            $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib advapi32.lib \
            $$($1_LIBS_windows), \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/$1_objs, \
        OUTPUT_DIR := $$($1_OUTPUT_DIR), \
-       PROGRAM := $1, \
        VERSIONINFO_RESOURCE := $$($1_VERSION_INFO_RESOURCE), \
        RC_FLAGS := $$(RC_FLAGS) \
            -D "JDK_FNAME=$1$(EXE_SUFFIX)" \
            -D "JDK_INTERNAL_NAME=$1" \
            -D "JDK_FTYPE=0x1L" \
--- 211,220 ----