Skip to content

Commit 5b17156

Browse files
committed
svm: check_libcontainer_annotations should also consider files in src/svm
1 parent bcc192b commit 5b17156

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

substratevm/mx.substratevm/mx_substratevm.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2229,7 +2229,14 @@ def _get_libcontainer_files():
22292229
for name in files:
22302230
abs_path = pathlib.PurePath(path, name)
22312231
rel_path = abs_path.relative_to(libcontainer_dir)
2232-
if pathlib.PurePath("src", "svm") not in rel_path.parents:
2232+
src_svm = pathlib.PurePath("src", "svm")
2233+
if src_svm in rel_path.parents:
2234+
# replace "svm" with "hotspot"
2235+
stripped_path = rel_path.relative_to(src_svm)
2236+
if not stripped_path.as_posix().startswith("svm_container"):
2237+
hotspot_path = pathlib.PurePath("src", "hotspot") / stripped_path
2238+
paths.append(hotspot_path.as_posix())
2239+
else:
22332240
paths.append(rel_path.as_posix())
22342241
return libcontainer_dir, paths
22352242

0 commit comments

Comments
 (0)