diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2025-03-30 00:33:04 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2025-03-30 00:33:04 +0000 |
| commit | 5ddc3e2d8f01496ed8b9a87cbe9c939f8f317eff (patch) | |
| tree | 94a3f21e47f02aed090772099b02c41031262a7b /eclass | |
| parent | ad108e7b751d67723534624b94eb0e04250dd1af (diff) | |
gentoo auto-resync : 30:03:2025 - 00:33:04
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 40356 -> 40358 bytes | |||
| -rw-r--r-- | eclass/cargo.eclass | 8 | ||||
| -rw-r--r-- | eclass/llvm.org.eclass | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 6e3dbeb0475f..33e59119f685 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass index dae2b93f24f3..95d485ab20c3 100644 --- a/eclass/cargo.eclass +++ b/eclass/cargo.eclass @@ -448,7 +448,9 @@ _cargo_gen_git_config() { # Return the directory within target that contains the build, e.g. # target/aarch64-unknown-linux-gnu/release. cargo_target_dir() { - echo "${CARGO_TARGET_DIR:-target}/$(rust_abi)/$(usex debug debug release)" + local abi + tc-is-cross-compiler && abi=/$(rust_abi) + echo "${CARGO_TARGET_DIR:-target}${abi}/$(usex debug debug release)" } # @FUNCTION: cargo_update_crates @@ -762,6 +764,10 @@ cargo_env() { # locally. Do this in a subshell so that they remain set afterwards. unset CARGO_BUILD_RUSTFLAGS CARGO_ENCODED_RUSTFLAGS RUSTFLAGS + # Only tell Cargo to cross-compile when actually needed to avoid the + # aforementioned build host vs target flag separation issue. + tc-is-cross-compiler || unset CARGO_BUILD_TARGET + "${@}" ) } diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass index 50de4a62af8f..7f0b26b734d1 100644 --- a/eclass/llvm.org.eclass +++ b/eclass/llvm.org.eclass @@ -72,6 +72,9 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then _LLVM_SOURCE_TYPE=snapshot case ${PV} in + 21.0.0_pre20250329) + EGIT_COMMIT=21eeca3db0341fef4ab4a6464ffe38b2eba5810c + ;; 21.0.0_pre20250322) EGIT_COMMIT=1d133420dc512487e2be0e9d86755f2a7c3497a7 ;; |