Skip to content

Commit

Permalink
Merge pull request ibmruntimes#430 from pshipton/mixed
Browse files Browse the repository at this point in the history
Move libj9a2e.so to lib directory
  • Loading branch information
keithc-ca authored Jul 15, 2021
2 parents 6a9be9a + 96b636a commit cd42395
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions closed/custom/copy/Copy-java.base.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ $(call openj9_copy_files_and_debuginfos, \
NO_JIT_CPUS := riscv64

$(call openj9_copy_shlibs, \
$(if $(filter zos,$(OPENJDK_TARGET_OS)),j9a2e) \
j9dmp29 \
j9gc29 \
$(if $(filter static,$(OMR_MIXED_REFERENCES_MODE)),j9gc_full29) \
Expand All @@ -84,7 +83,7 @@ $(call openj9_copy_shlibs, \
omrsig \
)

# static libraries that are needed on some platforms
# static and shared libraries that are needed on some platforms

ifeq ($(OPENJDK_TARGET_OS), windows)

Expand All @@ -99,6 +98,11 @@ $(call openj9_copy_files,, \

else ifeq ($(OPENJDK_TARGET_OS), zos)

$(call openj9_copy_files_and_debuginfos, \
$(addsuffix /$(call SHARED_LIBRARY,j9a2e), \
$(OPENJ9_VM_BUILD_DIR) \
$(LIB_DST_DIR)))

$(call openj9_copy_files,, \
$(addsuffix libjsig.x, \
$(OPENJ9_VM_BUILD_DIR)/lib/ \
Expand Down

0 comments on commit cd42395

Please sign in to comment.