makefiles/CompileLaunchers.gmk

*** 596,605 ****
--- 596,644 ----
          $(call install-file)
          $(CHMOD) a+x $@
  endif
  
  ##########################################################################################
+  
+ BUILD_JSPAWNHELPER := 
+ BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/solaris/native/java/lang
+ BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
+ LINK_JSPAWNHELPER_OBJECTS := $(JDK_OUTPUTDIR)/objs/libjava/childproc.o
+ LINK_JSPAWNHELPER_FLAGS :=
+ 
+ #
+ # jdk/make/java/java/Makefile
+ #
+ ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris),)
+     BUILD_JSPAWNHELPER := 1
+ endif
+ 
+ ifeq ($(OPENJDK_TARGET_OS), macosx)
+     BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib
+ endif
+ 
+ ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
+     LINK_JSPAWNHELPER_FLAGS += -m64
+ endif
+ 
+ ifeq ($(BUILD_JSPAWNHELPER), 1)
+     $(eval $(call SetupNativeCompilation,BUILD_JSPAWNHELPER,\
+         SRC:=$(BUILD_JSPAWNHELPER_SRC),\
+         INCLUDE_FILES:=jspawnhelper.c,\
+         LANG:=C,\
+         OPTIMIZATION := LOW, \
+         CFLAGS:=$(CFLAGS_JDKEXE), \
+         LDFLAGS:=$(LDFLAGS_JDKEXE) $(LINK_JSPAWNHELPER_FLAGS), \
+         LDFLAGS_SUFFIX:= $(LINK_JSPAWNHELPER_OBJECTS), \
+         OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jspawnhelper,\
+         OUTPUT_DIR:=$(BUILD_JSPAWNHELPER_DST_DIR),\
+         PROGRAM:=jspawnhelper))
+ 
+     BUILD_LAUNCHERS += $(BUILD_JSPAWNHELPER)
+ endif
+ 
+ ##########################################################################################
  # jabswitch
  
  ifndef OPENJDK
  ifeq ($(OPENJDK_TARGET_OS),windows)