]>
Commit | Line | Data |
---|---|---|
6301fb50 XL |
1 | --- a/vendor/cc/src/lib.rs |
2 | +++ b/vendor/cc/src/lib.rs | |
cefde48f | 3 | @@ -2069,7 +2069,7 @@ |
6301fb50 XL |
4 | || target == "wasm32-unknown-wasi" |
5 | || target == "wasm32-unknown-unknown" | |
6 | { | |
7 | - "clang".to_string() | |
8 | + "rust-clang".to_string() | |
9 | } else if target.contains("vxworks") { | |
0fb2d044 XL |
10 | if self.cpp { |
11 | "wr-c++".to_string() | |
6301fb50 XL |
12 | --- a/vendor/psm/build.rs |
13 | +++ b/vendor/psm/build.rs | |
14 | @@ -27,7 +27,7 @@ | |
15 | ("sparc", _, _, _) => Some(("src/arch/sparc_sysv.s", true)), | |
16 | ("riscv32", _, _, _) => Some(("src/arch/riscv.s", true)), | |
17 | ("riscv64", _, _, _) => Some(("src/arch/riscv64.s", true)), | |
18 | - ("wasm32", _, _, _) => Some(("src/arch/wasm32.o", true)), | |
19 | + ("wasm32", _, _, _) => Some(("src/arch/wasm32.s", true)), | |
20 | _ => None, | |
21 | } | |
22 | } | |
23 | @@ -61,11 +61,8 @@ | |
24 | cfg.define(&*format!("CFG_TARGET_ENV_{}", env), None); | |
25 | } | |
26 | ||
27 | - // For wasm targets we ship a precompiled `*.o` file so we just pass that | |
28 | - // directly to `ar` to assemble an archive. Otherwise we're actually | |
29 | - // compiling the source assembly file. | |
30 | if asm.ends_with(".o") { | |
31 | - cfg.object(asm); | |
32 | + panic!("Debian does not allow embedded object files in source code") | |
33 | } else { | |
34 | cfg.file(asm); | |
35 | } |