Skip to content

[GR-76470] Adjust wheeltags when built with swcfi and hwcfi toolchains. #961

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

Closed
graalvmbot wants to merge 1 commit into from
Closed

[GR-76470] Adjust wheeltags when built with swcfi and hwcfi toolchains. #961

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: 11 additions & 1 deletion mx.graalpython/mx_graalpython.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,12 @@ def wants_debug_build(flags=os.environ.get("CFLAGS", "")):
))


def _libc():
return mx_subst.path_substitutions.substitute("<multitarget_libc_selection>")


def _is_graalos_build():
return "musl" in mx_subst.path_substitutions.substitute("<multitarget_libc_selection>")
return "musl" in _libc()


def _with_bouncycastle():
Expand Down Expand Up @@ -2348,6 +2352,12 @@ def _graalpy_sysconfig_platform(os):
return 'darwin'
if os == 'windows':
return 'win32'
if _is_graalos_build():
libc = _libc()
if 'swcfi' in libc:
return 'graalos'
elif 'hwcfi' in libc:
return 'graalos_hwcfi'
return 'linux'


Expand Down
Loading