From f65ef3fddd9ef9cc3d2d172f6da9a39231b1e2d1 Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 20 Mar 2025 06:31:45 +0000 Subject: [PATCH] dev-lang/rust: provide more neutral `default-linker` ... otherwise CC at the time of building dev-lang/rust is baked in, which is problematic if e.g. CC=clang-19 is used and then it gets depcleaned later (as reported on the gentoo-user ML). Signed-off-by: Sam James --- dev-lang/rust/rust-1.71.1-r101.ebuild | 2 +- dev-lang/rust/rust-1.74.1-r101.ebuild | 2 +- dev-lang/rust/rust-1.75.0-r101.ebuild | 2 +- dev-lang/rust/rust-1.76.0-r101.ebuild | 2 +- dev-lang/rust/rust-1.77.1-r101.ebuild | 2 +- dev-lang/rust/rust-1.78.0-r101.ebuild | 2 +- dev-lang/rust/rust-1.79.0-r101.ebuild | 2 +- dev-lang/rust/rust-1.80.1-r101.ebuild | 2 +- dev-lang/rust/rust-1.81.0-r101.ebuild | 2 +- dev-lang/rust/rust-1.82.0-r102.ebuild | 2 +- dev-lang/rust/rust-1.83.0-r2.ebuild | 2 +- dev-lang/rust/rust-1.84.0-r1.ebuild | 2 +- dev-lang/rust/rust-1.84.1-r1.ebuild | 2 +- dev-lang/rust/rust-1.85.0-r1.ebuild | 2 +- dev-lang/rust/rust-1.85.0.ebuild | 2 +- dev-lang/rust/rust-1.85.1.ebuild | 2 +- dev-lang/rust/rust-1.86.0_beta20250218-r1.ebuild | 2 +- dev-lang/rust/rust-1.86.0_beta20250225.ebuild | 2 +- dev-lang/rust/rust-9999.ebuild | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dev-lang/rust/rust-1.71.1-r101.ebuild b/dev-lang/rust/rust-1.71.1-r101.ebuild index ae1366fb5ce30..ec66165dfcf78 100644 --- a/dev-lang/rust/rust-1.71.1-r101.ebuild +++ b/dev-lang/rust/rust-1.71.1-r101.ebuild @@ -333,7 +333,7 @@ src_configure() { debuginfo-level-tests = 0 backtrace = true incremental = false - default-linker = "$(tc-getCC)" + default-linker = "${CHOST}-cc" parallel-compiler = $(toml_usex parallel-compiler) channel = "$(usex nightly nightly stable)" description = "gentoo" diff --git a/dev-lang/rust/rust-1.74.1-r101.ebuild b/dev-lang/rust/rust-1.74.1-r101.ebuild index 3e8a2fb536d31..94eac92238086 100644 --- a/dev-lang/rust/rust-1.74.1-r101.ebuild +++ b/dev-lang/rust/rust-1.74.1-r101.ebuild @@ -399,7 +399,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) parallel-compiler = $(toml_usex parallel-compiler) channel = "$(usex nightly nightly stable)" diff --git a/dev-lang/rust/rust-1.75.0-r101.ebuild b/dev-lang/rust/rust-1.75.0-r101.ebuild index c0b81f631aa20..a193ef2259325 100644 --- a/dev-lang/rust/rust-1.75.0-r101.ebuild +++ b/dev-lang/rust/rust-1.75.0-r101.ebuild @@ -365,7 +365,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) parallel-compiler = $(toml_usex parallel-compiler) channel = "$(usex nightly nightly stable)" diff --git a/dev-lang/rust/rust-1.76.0-r101.ebuild b/dev-lang/rust/rust-1.76.0-r101.ebuild index f6114fd34e18d..c62b7eb8145c8 100644 --- a/dev-lang/rust/rust-1.76.0-r101.ebuild +++ b/dev-lang/rust/rust-1.76.0-r101.ebuild @@ -364,7 +364,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) parallel-compiler = $(toml_usex parallel-compiler) channel = "$(usex nightly nightly stable)" diff --git a/dev-lang/rust/rust-1.77.1-r101.ebuild b/dev-lang/rust/rust-1.77.1-r101.ebuild index 8ecaf535a291f..c806ab1fe7584 100644 --- a/dev-lang/rust/rust-1.77.1-r101.ebuild +++ b/dev-lang/rust/rust-1.77.1-r101.ebuild @@ -363,7 +363,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) parallel-compiler = $(toml_usex parallel-compiler) channel = "$(usex nightly nightly stable)" diff --git a/dev-lang/rust/rust-1.78.0-r101.ebuild b/dev-lang/rust/rust-1.78.0-r101.ebuild index f87df749f8471..20ec7fa25ee75 100644 --- a/dev-lang/rust/rust-1.78.0-r101.ebuild +++ b/dev-lang/rust/rust-1.78.0-r101.ebuild @@ -362,7 +362,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) parallel-compiler = $(toml_usex parallel-compiler) channel = "$(usex nightly nightly stable)" diff --git a/dev-lang/rust/rust-1.79.0-r101.ebuild b/dev-lang/rust/rust-1.79.0-r101.ebuild index 96171bb99b285..7954db900f46b 100644 --- a/dev-lang/rust/rust-1.79.0-r101.ebuild +++ b/dev-lang/rust/rust-1.79.0-r101.ebuild @@ -362,7 +362,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) parallel-compiler = $(toml_usex parallel-compiler) channel = "$(usex nightly nightly stable)" diff --git a/dev-lang/rust/rust-1.80.1-r101.ebuild b/dev-lang/rust/rust-1.80.1-r101.ebuild index e535b914f811b..a16db54428012 100644 --- a/dev-lang/rust/rust-1.80.1-r101.ebuild +++ b/dev-lang/rust/rust-1.80.1-r101.ebuild @@ -361,7 +361,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) parallel-compiler = $(toml_usex parallel-compiler) channel = "$(usex nightly nightly stable)" diff --git a/dev-lang/rust/rust-1.81.0-r101.ebuild b/dev-lang/rust/rust-1.81.0-r101.ebuild index c6fee6b41ad77..d6ba0f33baa04 100644 --- a/dev-lang/rust/rust-1.81.0-r101.ebuild +++ b/dev-lang/rust/rust-1.81.0-r101.ebuild @@ -365,7 +365,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) parallel-compiler = $(toml_usex parallel-compiler) channel = "$(usex nightly nightly stable)" diff --git a/dev-lang/rust/rust-1.82.0-r102.ebuild b/dev-lang/rust/rust-1.82.0-r102.ebuild index d68d0e8f12d86..d6ee9ac416de9 100644 --- a/dev-lang/rust/rust-1.82.0-r102.ebuild +++ b/dev-lang/rust/rust-1.82.0-r102.ebuild @@ -373,7 +373,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) parallel-compiler = $(toml_usex parallel-compiler) channel = "$(usex nightly nightly stable)" diff --git a/dev-lang/rust/rust-1.83.0-r2.ebuild b/dev-lang/rust/rust-1.83.0-r2.ebuild index 08cb004f06d15..b85f493c6ca74 100644 --- a/dev-lang/rust/rust-1.83.0-r2.ebuild +++ b/dev-lang/rust/rust-1.83.0-r2.ebuild @@ -373,7 +373,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) parallel-compiler = $(toml_usex parallel-compiler) channel = "$(usex nightly nightly stable)" diff --git a/dev-lang/rust/rust-1.84.0-r1.ebuild b/dev-lang/rust/rust-1.84.0-r1.ebuild index 298a051649466..6fc4e46d72418 100644 --- a/dev-lang/rust/rust-1.84.0-r1.ebuild +++ b/dev-lang/rust/rust-1.84.0-r1.ebuild @@ -374,7 +374,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) parallel-compiler = $(toml_usex parallel-compiler) channel = "$(usex nightly nightly stable)" diff --git a/dev-lang/rust/rust-1.84.1-r1.ebuild b/dev-lang/rust/rust-1.84.1-r1.ebuild index ae4c72a90cf20..4dd53ebc8d05d 100644 --- a/dev-lang/rust/rust-1.84.1-r1.ebuild +++ b/dev-lang/rust/rust-1.84.1-r1.ebuild @@ -374,7 +374,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) parallel-compiler = $(toml_usex parallel-compiler) channel = "$(usex nightly nightly stable)" diff --git a/dev-lang/rust/rust-1.85.0-r1.ebuild b/dev-lang/rust/rust-1.85.0-r1.ebuild index 5a2b6ef484518..011b8572a939b 100644 --- a/dev-lang/rust/rust-1.85.0-r1.ebuild +++ b/dev-lang/rust/rust-1.85.0-r1.ebuild @@ -462,7 +462,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) channel = "${build_channel}" description = "gentoo" diff --git a/dev-lang/rust/rust-1.85.0.ebuild b/dev-lang/rust/rust-1.85.0.ebuild index ce74a475077e9..e7079ae7c11e8 100644 --- a/dev-lang/rust/rust-1.85.0.ebuild +++ b/dev-lang/rust/rust-1.85.0.ebuild @@ -461,7 +461,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) channel = "${build_channel}" description = "gentoo" diff --git a/dev-lang/rust/rust-1.85.1.ebuild b/dev-lang/rust/rust-1.85.1.ebuild index 5a2b6ef484518..011b8572a939b 100644 --- a/dev-lang/rust/rust-1.85.1.ebuild +++ b/dev-lang/rust/rust-1.85.1.ebuild @@ -462,7 +462,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) channel = "${build_channel}" description = "gentoo" diff --git a/dev-lang/rust/rust-1.86.0_beta20250218-r1.ebuild b/dev-lang/rust/rust-1.86.0_beta20250218-r1.ebuild index c609ba084142b..bbf7e2c95c8ce 100644 --- a/dev-lang/rust/rust-1.86.0_beta20250218-r1.ebuild +++ b/dev-lang/rust/rust-1.86.0_beta20250218-r1.ebuild @@ -469,7 +469,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) channel = "${build_channel}" description = "gentoo" diff --git a/dev-lang/rust/rust-1.86.0_beta20250225.ebuild b/dev-lang/rust/rust-1.86.0_beta20250225.ebuild index 83f444b7cb326..7ccdcd48b3d64 100644 --- a/dev-lang/rust/rust-1.86.0_beta20250225.ebuild +++ b/dev-lang/rust/rust-1.86.0_beta20250225.ebuild @@ -469,7 +469,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) channel = "${build_channel}" description = "gentoo" diff --git a/dev-lang/rust/rust-9999.ebuild b/dev-lang/rust/rust-9999.ebuild index 97c665f7828d5..d7dd9d8d660c6 100644 --- a/dev-lang/rust/rust-9999.ebuild +++ b/dev-lang/rust/rust-9999.ebuild @@ -462,7 +462,7 @@ src_configure() { backtrace = true incremental = false $(if ! tc-is-cross-compiler; then - echo "default-linker = \"$(tc-getCC)\"" + echo "default-linker = \"${CHOST}-cc\"" fi) channel = "${build_channel}" description = "gentoo"