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

Include jextract and jpackcore on all platforms #785

Merged
merged 1 commit into from
Nov 28, 2024
Merged

Include jextract and jpackcore on all platforms #785

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
12 changes: 5 additions & 7 deletions jdk/make/CompileLaunchers.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#

# ===========================================================================
# (c) Copyright IBM Corp. 2017, 2021 All Rights Reserved
# (c) Copyright IBM Corp. 2017, 2024 All Rights Reserved
# ===========================================================================

default: all
Expand Down Expand Up @@ -521,14 +521,12 @@ $(eval $(call SetupLauncher,traceformat, \
-DEXPAND_CLASSPATH_WILDCARDS \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.ibm.jvm.TraceFormat" }'))

ifneq ($(findstring $(OPENJDK_TARGET_OS),aix linux macosx),)
$(eval $(call SetupLauncher,jextract, \
$(eval $(call SetupLauncher,jextract, \
-DEXPAND_CLASSPATH_WILDCARDS \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.ibm.jvm.j9.dump.extract.Main" }'))
$(eval $(call SetupLauncher,jpackcore, \
$(eval $(call SetupLauncher,jpackcore, \
-DEXPAND_CLASSPATH_WILDCARDS \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.ibm.jvm.j9.dump.extract.Main" }'))
endif

ifeq ($(OPENJDK_TARGET_OS), windows)
$(eval $(call SetupLauncher,kinit, \
Expand Down Expand Up @@ -558,8 +556,8 @@ $(eval $(call SetupLauncher,jstack, \
-DAPP_CLASSPATH='{ "/lib/tools.jar" }'))

$(eval $(call SetupLauncher,jstat, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "openj9.tools.attach.diagnostics.tools.Jstat" }' \
-DAPP_CLASSPATH='{ "/lib/tools.jar" }'))
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "openj9.tools.attach.diagnostics.tools.Jstat" }' \
-DAPP_CLASSPATH='{ "/lib/tools.jar" }'))

##########################################################################################
# The order of the object files on the link command line affects the size of the resulting
Expand Down