Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 98a34c6

Browse filesBrowse files
committed
[GR-76470] Adjust wheeltags when built with swcfi and hwcfi toolchains.
1 parent 8a7dc1c commit 98a34c6
Copy full SHA for 98a34c6

1 file changed

+11-1Lines changed: 11 additions & 1 deletion

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎mx.graalpython/mx_graalpython.py‎

Copy file name to clipboardExpand all lines: mx.graalpython/mx_graalpython.py
+11-1Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,12 @@ def wants_debug_build(flags=os.environ.get("CFLAGS", "")):
181181
))
182182

183183

184+
def _libc():
185+
return mx_subst.path_substitutions.substitute("<multitarget_libc_selection>")
186+
187+
184188
def _is_graalos_build():
185-
return "musl" in mx_subst.path_substitutions.substitute("<multitarget_libc_selection>")
189+
return "musl" in _libc()
186190

187191

188192
def _with_bouncycastle():
@@ -2348,6 +2352,12 @@ def _graalpy_sysconfig_platform(os):
23482352
return 'darwin'
23492353
if os == 'windows':
23502354
return 'win32'
2355+
if _is_graalos_build():
2356+
libc = _libc()
2357+
if 'swcfi' in libc:
2358+
return 'graalos'
2359+
elif 'hwcfi' in libc:
2360+
return 'graalos_hwcfi'
23512361
return 'linux'
23522362

23532363

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.