Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable additional Linux/Mac bundling OpenJCEPlus #81

Merged
merged 1 commit into from
Dec 4, 2024
Merged

Enable additional Linux/Mac bundling OpenJCEPlus #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion closed/make/modules/openjceplus/Copy.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ifeq (true,$(BUILD_OPENJCEPLUS))
# Copy OpenJCEPlus native libraries.
$(eval $(call SetupCopyFiles, OPENJCEPLUS_JGSKIT_LIBS_COPY, \
SRC := $(OPENJCEPLUS_TOPDIR)/target, \
FILES := $(filter %.dll %.so %.x, $(call FindFiles, $(OPENJCEPLUS_TOPDIR)/target)), \
FILES := $(filter %.dll %.dylib %.so %.x, $(call FindFiles, $(OPENJCEPLUS_TOPDIR)/target)), \
FLATTEN := true, \
DEST := $(LIB_DST_DIR), \
))
Expand Down
11 changes: 10 additions & 1 deletion closed/make/modules/openjceplus/Lib.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,22 @@ OPENJCEPLUS_JGSKIT_PLATFORM :=
ifeq ($(call isTargetOs, aix), true)
OPENJCEPLUS_JGSKIT_PLATFORM := ppc-aix64
else ifeq ($(call isTargetOs, linux), true)
ifeq ($(call isTargetCpu, ppc64le), true)
ifeq ($(call isTargetCpu, aarch64), true)
OPENJCEPLUS_JGSKIT_PLATFORM := arm-linux64
else ifeq ($(call isTargetCpu, ppc64le), true)
OPENJCEPLUS_JGSKIT_PLATFORM := ppcle-linux64
else ifeq ($(call isTargetCpu, s390x), true)
OPENJCEPLUS_JGSKIT_PLATFORM := s390-linux64
else ifeq ($(call isTargetCpu, x86_64), true)
OPENJCEPLUS_JGSKIT_PLATFORM := x86-linux64
endif
else ifeq ($(call isTargetOs, macosx), true)
ifeq ($(call isTargetCpu, aarch64), true)
OPENJCEPLUS_JGSKIT_PLATFORM := aarch64-mac
else ifeq ($(call isTargetCpu, x86_64), true)
OPENJCEPLUS_JGSKIT_PLATFORM := x86_64-mac
endif
OPENJCEPLUS_JGSKIT_MAKE := jgskit.mac.mak
else ifeq ($(call isTargetOs, windows), true)
ifeq ($(call isTargetCpu, x86_64), true)
EXPORT_COMPILER_ENV_VARS := LIB='$(OPENJ9_VS_LIB)'
Expand Down