mirror of
https://git.proxmox.com/git/rustc
synced 2025-08-18 01:40:46 +00:00
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
|
|
Date: Sat, 2 Oct 2021 01:08:00 +0100
|
|
Subject: d-0003-cc-psm-rebuild-wasm32
|
|
|
|
Forwarded: not-needed
|
|
---
|
|
vendor/cc-1.2.0/src/lib.rs | 2 +-
|
|
vendor/psm-0.1.24/build.rs | 7 ++-----
|
|
2 files changed, 3 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/vendor/cc-1.2.0/src/lib.rs b/vendor/cc-1.2.0/src/lib.rs
|
|
index a0aaa30..202ff17 100644
|
|
--- a/vendor/cc-1.2.0/src/lib.rs
|
|
+++ b/vendor/cc-1.2.0/src/lib.rs
|
|
@@ -2623,7 +2623,7 @@ impl Build {
|
|
let (env, msvc, gnu, traditional, clang) = if self.cpp {
|
|
("CXX", "cl.exe", "g++", "c++", "clang++")
|
|
} else {
|
|
- ("CC", "cl.exe", "gcc", "cc", "clang")
|
|
+ ("CC", "cl.exe", "gcc", "cc", "rust-clang")
|
|
};
|
|
|
|
// On historical Solaris systems, "cc" may have been Sun Studio, which
|
|
diff --git a/vendor/psm-0.1.24/build.rs b/vendor/psm-0.1.24/build.rs
|
|
index bc84149..a299ab5 100644
|
|
--- a/vendor/psm-0.1.24/build.rs
|
|
+++ b/vendor/psm-0.1.24/build.rs
|
|
@@ -51,7 +51,7 @@ fn find_assembly(
|
|
("sparc", _, _, _) => Some(("src/arch/sparc_sysv.s", true)),
|
|
("riscv32", _, _, _) => Some(("src/arch/riscv.s", true)),
|
|
("riscv64", _, _, _) => Some(("src/arch/riscv64.s", true)),
|
|
- ("wasm32", _, _, _) => Some(("src/arch/wasm32.o", true)),
|
|
+ ("wasm32", _, _, _) => Some(("src/arch/wasm32.s", true)),
|
|
("loongarch64", _, _, _) => Some(("src/arch/loongarch64.s", true)),
|
|
_ => None,
|
|
}
|
|
@@ -99,11 +99,8 @@ fn main() {
|
|
cfg.define(&*format!("CFG_TARGET_ENV_{}", env), None);
|
|
}
|
|
|
|
- // For wasm targets we ship a precompiled `*.o` file so we just pass that
|
|
- // directly to `ar` to assemble an archive. Otherwise we're actually
|
|
- // compiling the source assembly file.
|
|
if asm.ends_with(".o") {
|
|
- cfg.object(asm);
|
|
+ panic!("Debian does not allow embedded object files in source code")
|
|
} else {
|
|
cfg.file(asm);
|
|
}
|