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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
|
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.
--- a/vendor/rustix/Cargo.toml
+++ b/vendor/rustix/Cargo.toml
@@ -125,9 +125,9 @@
[dev-dependencies.tempfile]
version = "3.4.0"
-[build-dependencies.cc]
+[build-dependencies.cc_dep]
version = "1.0.68"
-optional = true
+package = "cc"
[features]
all-apis = [
@@ -242,6 +242,7 @@
"Win32_NetworkManagement_IpHelper",
"Win32_System_Threading",
]
+cc = []
[target."cfg(windows)".dev-dependencies.ctor]
version = "0.1.21"
--- a/vendor/rustix/build.rs
+++ b/vendor/rustix/build.rs
@@ -1,5 +1,4 @@
-#[cfg(feature = "cc")]
-use cc::Build;
+use cc_dep::Build;
use std::env::var;
use std::io::Write;
@@ -158,16 +157,16 @@
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
--- a/vendor/rustix-0.36.5/Cargo.toml
+++ b/vendor/rustix-0.36.5/Cargo.toml
@@ -116,9 +116,9 @@
[dev-dependencies.tempfile]
version = "3.2.0"
-[build-dependencies.cc]
+[build-dependencies.cc_dep]
version = "1.0.68"
-optional = true
+package = "cc"
[features]
all-apis = [
@@ -231,6 +231,7 @@
"Win32_NetworkManagement_IpHelper",
"Win32_System_Threading",
]
+cc = []
[target."cfg(windows)".dev-dependencies.ctor]
version = "0.1.21"
--- a/vendor/rustix-0.36.5/build.rs
+++ b/vendor/rustix-0.36.5/build.rs
@@ -1,5 +1,4 @@
-#[cfg(feature = "cc")]
-use cc::Build;
+use cc_dep::Build;
use std::env::var;
use std::io::Write;
@@ -118,16 +117,16 @@
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();
Build::new().file(&asm_name).compile(&name);
|
