[GR-54873] Make musl optional for RISC-V

PullRequest: graal/17708
oracle · Jun 21, 2024 · d252172 · d252172
2 parents 4186b49 + d498a0a
commit d252172
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/sdk/mx.sdk/suite.py b/sdk/mx.sdk/suite.py
@@ -227,6 +227,9 @@
  "urls" : ["https://lafo.ssw.uni-linz.ac.at/pub/toolchain-gcc-musl/toolchain-gcc-10.2.1-musl-1.2.2-linux-aarch64.tar.gz"],
  "digest" : "sha512:f5545f6b36c2306861c026895d437a57357515e8dfefb0e8419413f61b146f42dc072f8a8a7a9f4885d6448396d656f59264e61e3f5eedd278486228aa58904e",
  },
+ "<others>": {
+ "optional": True,
+ },
  },
  "<others>": {
  "<others>": {

diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
@@ -1152,7 +1152,7 @@ def native_image_context_run(func, func_args=None, config=None, build_if_missing
  'substratevm:NATIVE_IMAGE_BASE',
  ] + (['substratevm:SVM_FOREIGN'] if mx_sdk_vm.base_jdk().javaCompliance >= '22' else []),
  support_distributions=['substratevm:SVM_GRAALVM_SUPPORT'],
- extra_native_targets=['linux-default-glibc', 'linux-default-musl'] if mx.is_linux() else None,
+ extra_native_targets=['linux-default-glibc', 'linux-default-musl'] if mx.is_linux() and not mx.get_arch() == 'riscv64' else None,
  stability="earlyadopter",
  jlink=False,
  installable=False,