Merge pull request ibmruntimes#3 from GROEGES/sg-zos_bringup

Latest z/OS bringup changes for jdk11
keithc-ca · May 8, 2018 · e59fd5a · e59fd5a
2 parents 61be8d8 + 0c1adc1
commit e59fd5a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/closed/make/Main.gmk b/closed/make/Main.gmk
@@ -33,7 +33,7 @@ JVM_TEST_IMAGE_TARGETS :=
 DEFAULT_JMOD_DEPS := j9vm-compose-buildjvm
 PHASE_MAKEDIRS += $(TOPDIR)/closed/make/closed_make
 
-java.base-libs : j9vm-build
+java.base-libs : java.base-copy j9vm-build
 
 j9vm-build : buildtools-langtools
 	+($(CD) $(TOPDIR)/closed && $(MAKE) -f OpenJ9.gmk SPEC=$(SPEC) VERSION_MAJOR=$(VERSION_FEATURE) build-j9)

diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
@@ -1003,9 +1003,11 @@ define SetupNativeCompilationBody
 		          $$($1_LIBS) $$($1_EXTRA_LIBS)) ; \
 		  $$($1_CREATE_DEBUGINFO_CMDS)
 		  $$($1_STRIP_CMD)
-          # we need mv zos static lib .x file to output dir
+                  # we need mv zos static lib .x file to output dir
           	  ifeq ($(OPENJDK_TARGET_OS), zos)
-		     $(MV) $$($1_NOSUFFIX).x $$($1_OUTPUT_DIR)
+                     ifeq ($$($1_TYPE), LIBRARY)
+		        $(MV) $$($1_NOSUFFIX).x $$($1_OUTPUT_DIR)
+                     endif
        		  endif
        		endif
 

diff --git a/make/gendata/GendataBlacklistedCerts.gmk b/make/gendata/GendataBlacklistedCerts.gmk
@@ -33,4 +33,4 @@ $(GENDATA_BLACKLISTED_CERTS): $(BUILD_TOOLS) $(GENDATA_BLACKLISTED_CERTS_SRC)
 	$(call MakeDir, $(@D))
 	($(CAT) $(GENDATA_BLACKLISTED_CERTS_SRC) | $(TOOL_BLACKLISTED_CERTS) > $@) || exit 1
 
-TARGETS += $(GENDATA_BLACKLISTED_CERTS)
+#TARGETS += $(GENDATA_BLACKLISTED_CERTS)
diff --git a/make/launcher/LauncherCommon.gmk b/make/launcher/LauncherCommon.gmk
@@ -103,7 +103,7 @@ else ifeq ($(TOOLCHAIN_TYPE), xlc)
   LAUNCHER_CFLAGS += -qvisibility=hidden
 endif
 
-LAUNCHER_SRC := $(TOPDIR)/src/java.base/share/native/launcher
+LAUNCHER_SRC := $(TOPDIR)/src/java.base/share/native/launcher/main.c
 ifeq ($(OPENJDK_TARGET_OS), zos)
   LAUNCHER_SRC += $(TOPDIR)/src/java.base/zos/native/launcher/setLibPath.c
 endif
@@ -223,7 +223,7 @@ define SetupBuildLauncherBody
 
   $$(eval $$(call SetupJdkExecutable, BUILD_LAUNCHER_$1, \
       NAME := $1, \
-      EXTRA_FILES := $(LAUNCHER_SRC)/main.c, \
+      EXTRA_FILES := $(LAUNCHER_SRC), \
       OPTIMIZATION := $$($1_OPTIMIZATION), \
       CFLAGS := $(CFLAGS_EXTRAFLAGS_zos) $$($1_CFLAGS) \
           $(LAUNCHER_CFLAGS) \