From 7b54510ec9dd325bab705f5d74e62b853f458d38 Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Fri, 9 Aug 2024 17:01:47 +0100 Subject: [PATCH 1/3] Change dependency to labsjdk-ce-latest Signed-off-by: Stefan Marr --- mx.trufflesom/suite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mx.trufflesom/suite.py b/mx.trufflesom/suite.py index 8725b50c9..662782f99 100644 --- a/mx.trufflesom/suite.py +++ b/mx.trufflesom/suite.py @@ -30,7 +30,7 @@ "licence": "LGPLv21", }, "LABS_JDK": { - "id": "labsjdk-ce-21", + "id": "labsjdk-ce-latest", # I am just using the suite.py to store the info # so but manage it in mx_trufflesom.py "path": ".", From 46ed831b944bf5409cc61e645ab0661edf573c68 Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Fri, 9 Aug 2024 17:15:18 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Don=E2=80=99t=20use=20macro:truffle=20for?= =?UTF-8?q?=20the=20object=20storage=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Marr --- mx.trufflesom/mx_trufflesom.py | 1 - 1 file changed, 1 deletion(-) diff --git a/mx.trufflesom/mx_trufflesom.py b/mx.trufflesom/mx_trufflesom.py index f50f9c68b..0a8cff488 100644 --- a/mx.trufflesom/mx_trufflesom.py +++ b/mx.trufflesom/mx_trufflesom.py @@ -219,7 +219,6 @@ def build_native_obj_test(args, **kwargs): svm_path = get_svm_path() cmd = [ "native-image", - "--macro:truffle", "--no-fallback", "--initialize-at-build-time", "-H:+ReportExceptionStackTraces", From 1ce9c7cf00f42e9c3e86501d9eb42dff8679f832 Mon Sep 17 00:00:00 2001 From: Stefan Marr Date: Tue, 30 Jul 2024 21:50:30 +0100 Subject: [PATCH 3/3] Add missing bits to launcher Signed-off-by: Stefan Marr --- som | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/som b/som index 4887a41ee..d28228a66 100755 --- a/som +++ b/som @@ -295,7 +295,11 @@ MODULE_PATH_ENTRIES = [ TRUFFLE_DIR + '/sdk/mxbuild/dists/polyglot.jar', TRUFFLE_DIR + '/sdk/mxbuild/dists/word.jar', TRUFFLE_DIR + '/sdk/mxbuild/dists/nativeimage.jar', - TRUFFLE_DIR + '/truffle/mxbuild/dists/truffle-api.jar'] + TRUFFLE_DIR + '/sdk/mxbuild/dists/jniutils.jar', + TRUFFLE_DIR + '/truffle/mxbuild/dists/truffle-json.jar', + TRUFFLE_DIR + '/truffle/mxbuild/dists/truffle-compiler.jar', + TRUFFLE_DIR + '/truffle/mxbuild/dists/truffle-api.jar', + TRUFFLE_DIR + '/truffle/mxbuild/dists/truffle-runtime.jar'] SOM_ARGS = ['--module', 'trufflesom/trufflesom.Launcher']