From 317eae068f0bb639c0bec3421163fb3f6b3c182b Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Tue, 8 Apr 2025 00:15:36 +1000 Subject: [PATCH 1/3] Fix musl compilation: Add musl as a prefix fallback Fixed #1452 --- src/lib.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 85f157458..d66e13613 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3510,7 +3510,10 @@ impl Build { "x86_64-unknown-linux-gnu" => self.find_working_gnu_prefix(&[ "x86_64-linux-gnu", // rustfmt wrap ]), // explicit None if not found, so caller knows to fall back - "x86_64-unknown-linux-musl" => Some("x86_64-linux-musl"), + "x86_64-unknown-linux-musl" => self.find_working_gnu_prefix(&[ + "x86_64-linux-musl", + "musl", + ]), "x86_64-unknown-netbsd" => Some("x86_64--netbsd"), _ => None, } From f60a84a0505b583d5aac06d5673368ad5db48582 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Tue, 8 Apr 2025 00:20:07 +1000 Subject: [PATCH 2/3] Fix fmt of lib.rs --- src/lib.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index d66e13613..79d2e27c6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3510,10 +3510,9 @@ impl Build { "x86_64-unknown-linux-gnu" => self.find_working_gnu_prefix(&[ "x86_64-linux-gnu", // rustfmt wrap ]), // explicit None if not found, so caller knows to fall back - "x86_64-unknown-linux-musl" => self.find_working_gnu_prefix(&[ - "x86_64-linux-musl", - "musl", - ]), + "x86_64-unknown-linux-musl" => { + self.find_working_gnu_prefix(&["x86_64-linux-musl", "musl"]) + }, "x86_64-unknown-netbsd" => Some("x86_64--netbsd"), _ => None, } From fc0ad25e53ef881d22b3e087c2a6ba82a049a7f5 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Tue, 8 Apr 2025 00:23:00 +1000 Subject: [PATCH 3/3] Fix fmt in lib.rs --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 79d2e27c6..6139bb25c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3512,7 +3512,7 @@ impl Build { ]), // explicit None if not found, so caller knows to fall back "x86_64-unknown-linux-musl" => { self.find_working_gnu_prefix(&["x86_64-linux-musl", "musl"]) - }, + } "x86_64-unknown-netbsd" => Some("x86_64--netbsd"), _ => None, }