1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
Always enable cc even if the feature is not enabled.
Some Debian architectures need outline asm, and Debian does not ship pre-built
outline asm.
Index: rust/vendor/rustix/build.rs
===================================================================
--- rust.orig/vendor/rustix/build.rs
+++ rust/vendor/rustix/build.rs
@@ -1,4 +1,3 @@
-#[cfg(feature = "cc")]
use cc::Build;
use std::env::var;
use std::io::Write;
@@ -158,16 +157,16 @@ fn link_in_librustix_outline(arch: &str,
println!("cargo:rerun-if-changed={}", to);
// If "cc" is not enabled, use a pre-built library.
- #[cfg(not(feature = "cc"))]
+ /*#[cfg(not(feature = "cc"))]
{
let _ = asm_name;
println!("cargo:rustc-link-search={}/{}", OUTLINE_PATH, profile);
println!("cargo:rustc-link-lib=static={}", name);
- }
+ }*/
// If "cc" is enabled, build the library from source, update the pre-built
// version, and assert that the pre-built version is checked in.
- #[cfg(feature = "cc")]
+ //#[cfg(feature = "cc")]
{
let out_dir = var("OUT_DIR").unwrap();
// Add `-gdwarf-3` so that we always get the same output, regardless of
Index: rust/vendor/rustix/Cargo.toml
===================================================================
--- rust.orig/vendor/rustix/Cargo.toml
+++ rust/vendor/rustix/Cargo.toml
@@ -127,7 +127,6 @@ version = "3.4.0"
[build-dependencies.cc]
version = "1.0.68"
-optional = true
[features]
all-apis = [
|
