OpenJDK / portola / portola
changeset 43618:6ad08a95d2db
8174086: jspawnhelper build settings cleanup
Reviewed-by: erikj
| author | mbaesken |
|---|---|
| date | Thu, 09 Feb 2017 09:27:47 +0100 |
| parents | 88471465b9f0 |
| children | ed4d42447282 |
| files | jdk/make/launcher/Launcher-java.base.gmk |
| diffstat | 1 files changed, 8 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/launcher/Launcher-java.base.gmk Tue Feb 07 20:29:24 2017 +0100 +++ b/jdk/make/launcher/Launcher-java.base.gmk Thu Feb 09 09:27:47 2017 +0100 @@ -135,34 +135,17 @@ ################################################################################ -BUILD_JSPAWNHELPER := -BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/java.base/unix/native/jspawnhelper -JSPAWNHELPER_CFLAGS := -I$(JDK_TOPDIR)/src/java.base/unix/native/libjava -BUILD_JSPAWNHELPER_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base -LINK_JSPAWNHELPER_OBJECTS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava/childproc.o -BUILD_JSPAWNHELPER_LDFLAGS := - ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix), ) - BUILD_JSPAWNHELPER := 1 -endif - -ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) - BUILD_JSPAWNHELPER_LDFLAGS += $(COMPILER_TARGET_BITS_FLAG)64 -endif - -ifeq ($(BUILD_JSPAWNHELPER), 1) - $(eval $(call SetupNativeCompilation,BUILD_JSPAWNHELPER, \ - SRC := $(BUILD_JSPAWNHELPER_SRC), \ - INCLUDE_FILES := jspawnhelper.c, \ + $(eval $(call SetupNativeCompilation, BUILD_JSPAWNHELPER, \ + SRC := $(JDK_TOPDIR)/src/$(MODULE)/unix/native/jspawnhelper, \ OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKEXE) $(JSPAWNHELPER_CFLAGS), \ - LDFLAGS := $(LDFLAGS_JDKEXE) $(BUILD_JSPAWNHELPER_LDFLAGS), \ - LIBS := $(LINK_JSPAWNHELPER_OBJECTS), \ + CFLAGS := $(CFLAGS_JDKEXE) -I$(JDK_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 := $(BUILD_JSPAWNHELPER_DST_DIR), \ - PROGRAM := jspawnhelper)) - - $(BUILD_JSPAWNHELPER): $(LINK_JSPAWNHELPER_OBJECTS) + OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE), \ + PROGRAM := jspawnhelper, \ + )) TARGETS += $(BUILD_JSPAWNHELPER) endif