diff --git a/cmake/tools/SetupRust.cmake b/cmake/tools/SetupRust.cmake
index 0b5b2b1d6c..9df5bcbf0e 100644
--- a/cmake/tools/SetupRust.cmake
+++ b/cmake/tools/SetupRust.cmake
@@ -15,7 +15,11 @@ endif()
 if(APPLE)
   set(DEFAULT_RUST_TARGET ${DEFAULT_RUST_ARCH}-apple-darwin)
 elseif(LINUX)
-  set(DEFAULT_RUST_TARGET ${DEFAULT_RUST_ARCH}-unknown-linux-gnu)
+  if(ABI STREQUAL "musl")
+    set(DEFAULT_RUST_TARGET ${DEFAULT_RUST_ARCH}-unknown-linux-musl)
+  else()
+    set(DEFAULT_RUST_TARGET ${DEFAULT_RUST_ARCH}-unknown-linux-gnu)
+  endif()
 elseif(WIN32)
   set(DEFAULT_RUST_TARGET ${DEFAULT_RUST_ARCH}-pc-windows-msvc)
 else()
diff --git a/scripts/utils.mjs b/scripts/utils.mjs
index 94c2a3f96a..4440da7bc6 100755
--- a/scripts/utils.mjs
+++ b/scripts/utils.mjs
@@ -2332,10 +2332,11 @@ function parseLevel(level) {
  * @returns {Annotation}
  */
 export function parseAnnotation(options, context) {
+  const cwd = (context?.["cwd"] || process.cwd()).replace(/\\/g, "/");
   const source = options["source"];
   const level = parseLevel(options["level"]);
   const title = options["title"] || (source ? `${source} ${level}` : level);
-  const filename = options["filename"];
+  const path = options["filename"]?.replace(/\\/g, "/");
   const line = parseInt(options["line"]) || undefined;
   const column = parseInt(options["column"]) || undefined;
   const content = options["content"];
@@ -2354,6 +2355,13 @@ export function parseAnnotation(options, context) {
     relevantLines.push(line);
   }
 
+  let filename;
+  if (path?.startsWith(cwd)) {
+    filename = path.slice(cwd.length + 1);
+  } else {
+    filename = path;
+  }
+
   return {
     source,
     title,