From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Mon, 27 May 2024 11:28:20 +0000 (+0200)
Subject: d-fix-rustix-outline
X-Git-Tag: archive/raspbian/1.72.1+dfsg1-1+rpi1^2~32
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=617d97a762f3236c23e0507baf16fc050a21b50c;p=rustc.git

d-fix-rustix-outline

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.


Gbp-Pq: Name d-fix-rustix-outline.patch
---

diff --git a/vendor/rustix-0.37.11/Cargo.toml b/vendor/rustix-0.37.11/Cargo.toml
index a0ea91d13c..a844f00cab 100644
--- a/vendor/rustix-0.37.11/Cargo.toml
+++ b/vendor/rustix-0.37.11/Cargo.toml
@@ -127,7 +127,6 @@ version = "3.4.0"
 
 [build-dependencies.cc]
 version = "1.0.68"
-optional = true
 
 [features]
 all-apis = [
diff --git a/vendor/rustix-0.37.11/build.rs b/vendor/rustix-0.37.11/build.rs
index 47c76c77d6..803e2d7c95 100644
--- a/vendor/rustix-0.37.11/build.rs
+++ b/vendor/rustix-0.37.11/build.rs
@@ -1,4 +1,3 @@
-#[cfg(feature = "cc")]
 use cc::Build;
 use std::env::var;
 use std::io::Write;
@@ -161,16 +160,16 @@ fn link_in_librustix_outline(arch: &str, asm_name: &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
diff --git a/vendor/rustix-0.37.20/Cargo.toml b/vendor/rustix-0.37.20/Cargo.toml
index 1a23dff466..ee01aac118 100644
--- a/vendor/rustix-0.37.20/Cargo.toml
+++ b/vendor/rustix-0.37.20/Cargo.toml
@@ -127,7 +127,6 @@ version = "3.4.0"
 
 [build-dependencies.cc]
 version = "1.0.68"
-optional = true
 
 [features]
 all-apis = [
diff --git a/vendor/rustix-0.37.20/build.rs b/vendor/rustix-0.37.20/build.rs
index 320b3052be..c5464096f7 100644
--- a/vendor/rustix-0.37.20/build.rs
+++ b/vendor/rustix-0.37.20/build.rs
@@ -1,4 +1,3 @@
-#[cfg(feature = "cc")]
 use cc::Build;
 use std::env::var;
 use std::io::Write;
@@ -169,16 +168,16 @@ fn link_in_librustix_outline(arch: &str, asm_name: &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
diff --git a/vendor/rustix/Cargo.toml b/vendor/rustix/Cargo.toml
index dd40b2507c..3b221a4fba 100644
--- a/vendor/rustix/Cargo.toml
+++ b/vendor/rustix/Cargo.toml
@@ -117,7 +117,6 @@ version = "3.5.0"
 
 [build-dependencies.cc]
 version = "1.0.68"
-optional = true
 
 [features]
 all-apis = [
diff --git a/vendor/rustix/build.rs b/vendor/rustix/build.rs
index 26f306e58d..b85f011983 100644
--- a/vendor/rustix/build.rs
+++ b/vendor/rustix/build.rs
@@ -1,4 +1,3 @@
-#[cfg(feature = "cc")]
 use cc::Build;
 use std::env::var;
 use std::io::Write;
@@ -165,16 +164,16 @@ fn link_in_librustix_outline(arch: &str, asm_name: &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