Skip to content

Commit 6313b59

Browse files
committed
Moved polyglot isolate registration to graalpython.
1 parent 6727bb1 commit 6313b59

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

mx.graalpython/mx_graalpython.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,22 @@ def _extract_graalpython_internal_options(args):
217217
return non_internal, additional_dists
218218

219219

220+
221+
def mx_register_dynamic_suite_constituents(register_project, register_distribution):
222+
if register_project and register_distribution:
223+
isolate_build_options = [
224+
'-H:+DetectUserDirectoriesInImageHeap',
225+
]
226+
meta_pom = None
227+
for dist in SUITE.dists:
228+
if dist.name == 'PYTHON_POM':
229+
meta_pom = dist
230+
assert meta_pom, "Cannot find python meta-POM distribution in the graalpython suite"
231+
mx_truffle.register_polyglot_isolate_distributions(SUITE, register_project, register_distribution,'python',
232+
'graalpython', meta_pom.name, meta_pom.maven_group_id(), meta_pom.theLicense,
233+
isolate_build_options)
234+
235+
220236
def extend_os_env(**kwargs):
221237
env = os.environ.copy()
222238
env.update(**kwargs)

mx.graalpython/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@
5353
},
5454
{
5555
"name": "tools",
56-
"version": "82009ecd52f65a742af96afd1a51a847b533fb2a",
56+
"version": "9f616a9166a56ee973a699b2812f0d36170e301d",
5757
"subdir": True,
5858
"urls": [
5959
{"url": "https://github.com/oracle/graal", "kind": "git"},
6060
],
6161
},
6262
{
6363
"name": "regex",
64-
"version": "82009ecd52f65a742af96afd1a51a847b533fb2a",
64+
"version": "9f616a9166a56ee973a699b2812f0d36170e301d",
6565
"subdir": True,
6666
"urls": [
6767
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)