make/launcher/Launcher-java.base.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2017, 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,108 ****
  
  ################################################################################
  
  ifeq ($(OPENJDK_TARGET_OS), linux)
    $(eval $(call SetupNativeCompilation, BUILD_JEXEC, \
        SRC := $(TOPDIR)/src/$(MODULE)/unix/native/launcher, \
        INCLUDE_FILES := jexec.c, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKEXE) \
            -I$(TOPDIR)/src/$(MODULE)/share/native/libjli, \
        CFLAGS_linux := -fPIC, \
        CFLAGS_solaris := -KPIC, \
        LDFLAGS := $(LDFLAGS_JDKEXE), \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jexec_obj, \
        OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
-       PROGRAM := jexec, \
    ))
  
    TARGETS += $(BUILD_JEXEC)
  endif
  
  ################################################################################
  
  ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix), )
    $(eval $(call SetupNativeCompilation, BUILD_JSPAWNHELPER, \
        SRC := $(TOPDIR)/src/$(MODULE)/unix/native/jspawnhelper, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKEXE) -I$(TOPDIR)/src/$(MODULE)/unix/native/libjava, \
        EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava/childproc.o, \
        LDFLAGS := $(LDFLAGS_JDKEXE), \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jspawnhelper, \
        OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
-       PROGRAM := jspawnhelper, \
    ))
  
    TARGETS += $(BUILD_JSPAWNHELPER)
  endif
  
--- 71,110 ----
  
  ################################################################################
  
  ifeq ($(OPENJDK_TARGET_OS), linux)
    $(eval $(call SetupNativeCompilation, BUILD_JEXEC, \
+       NAME := jexec, \
+       TYPE := EXECUTABLE, \
        SRC := $(TOPDIR)/src/$(MODULE)/unix/native/launcher, \
        INCLUDE_FILES := jexec.c, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKEXE) \
            -I$(TOPDIR)/src/$(MODULE)/share/native/libjli, \
        CFLAGS_linux := -fPIC, \
        CFLAGS_solaris := -KPIC, \
        LDFLAGS := $(LDFLAGS_JDKEXE), \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jexec_obj, \
        OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
    ))
  
    TARGETS += $(BUILD_JEXEC)
  endif
  
  ################################################################################
  
  ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix), )
    $(eval $(call SetupNativeCompilation, BUILD_JSPAWNHELPER, \
+       NAME := jspawnhelper, \
+       TYPE := EXECUTABLE, \
        SRC := $(TOPDIR)/src/$(MODULE)/unix/native/jspawnhelper, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKEXE) -I$(TOPDIR)/src/$(MODULE)/unix/native/libjava, \
        EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava/childproc.o, \
        LDFLAGS := $(LDFLAGS_JDKEXE), \
        OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jspawnhelper, \
        OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \
    ))
  
    TARGETS += $(BUILD_JSPAWNHELPER)
  endif