make/launcher/Launcher-java.base.gmk

*** 49,59 ****
          $(RM) $@
          $(CP) $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs/java$(EXE_SUFFIX) $@
  
  TARGETS += $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX)
  
! ifeq ($(OPENJDK_TARGET_OS), windows)
    $(eval $(call SetupBuildLauncher, javaw, \
        CFLAGS := -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
        EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \
        VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
    ))
--- 49,59 ----
          $(RM) $@
          $(CP) $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/java_objs/java$(EXE_SUFFIX) $@
  
  TARGETS += $(SUPPORT_OUTPUTDIR)/modules_cmds/java.base/java$(EXE_SUFFIX)
  
! ifeq ($(call isTargetOs, windows), true)
    $(eval $(call SetupBuildLauncher, javaw, \
        CFLAGS := -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS -DENABLE_ARG_FILES, \
        EXTRA_RC_FLAGS := $(JAVA_RC_FLAGS), \
        VERSION_INFO_RESOURCE := $(JAVA_VERSION_INFO_RESOURCE), \
    ))
*** 63,73 ****
      MAIN_CLASS := sun.security.tools.keytool.Main, \
  ))
  
  ################################################################################
  
! ifeq ($(OPENJDK_TARGET_OS), linux)
    $(eval $(call SetupJdkExecutable, BUILD_JEXEC, \
        NAME := jexec, \
        SRC := $(TOPDIR)/src/$(MODULE)/unix/native/launcher, \
        INCLUDE_FILES := jexec.c, \
        OPTIMIZATION := LOW, \
--- 63,73 ----
      MAIN_CLASS := sun.security.tools.keytool.Main, \
  ))
  
  ################################################################################
  
! ifeq ($(call isTargetOs, linux), true)
    $(eval $(call SetupJdkExecutable, BUILD_JEXEC, \
        NAME := jexec, \
        SRC := $(TOPDIR)/src/$(MODULE)/unix/native/launcher, \
        INCLUDE_FILES := jexec.c, \
        OPTIMIZATION := LOW, \
*** 82,92 ****
    TARGETS += $(BUILD_JEXEC)
  endif
  
  ################################################################################
  
! ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix linux), )
    $(eval $(call SetupJdkExecutable, BUILD_JSPAWNHELPER, \
        NAME := jspawnhelper, \
        SRC := $(TOPDIR)/src/$(MODULE)/unix/native/jspawnhelper, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKEXE) -I$(TOPDIR)/src/$(MODULE)/unix/native/libjava, \
--- 82,92 ----
    TARGETS += $(BUILD_JEXEC)
  endif
  
  ################################################################################
  
! ifeq ($(call isTargetOs, macosx solaris aix linux), true)
    $(eval $(call SetupJdkExecutable, BUILD_JSPAWNHELPER, \
        NAME := jspawnhelper, \
        SRC := $(TOPDIR)/src/$(MODULE)/unix/native/jspawnhelper, \
        OPTIMIZATION := LOW, \
        CFLAGS := $(CFLAGS_JDKEXE) -I$(TOPDIR)/src/$(MODULE)/unix/native/libjava, \