Compare commits

1 Commits

Author SHA256 Message Date
Marcus Meissner
adb837e5c3 use gcc15 , we do not have gcc14 in SLFO 1.2 2025-11-04 16:57:27 +00:00
3 changed files with 10 additions and 60 deletions

View File

@@ -1,34 +0,0 @@
From 5745751b23e3eee1906b4aca883560bc916e640a Mon Sep 17 00:00:00 2001
From: William Brown <william@blackhats.net.au>
Date: Tue, 28 Oct 2025 12:32:38 +1000
Subject: [PATCH] Disable broken linker tests
---
compiler/rustc_target/src/spec/mod.rs | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
index 1638c87c9ca..42b1c414f38 100644
--- a/compiler/rustc_target/src/spec/mod.rs
+++ b/compiler/rustc_target/src/spec/mod.rs
@@ -1414,17 +1414,6 @@ fn load_all_builtins() -> impl Iterator<Item = Target> {
.into_iter()
.map(|f| f())
}
-
- #[cfg(test)]
- mod tests {
- // Cannot put this into a separate file without duplication, make an exception.
- $(
- #[test] // `#[test]`
- fn $module() {
- crate::spec::targets::$module::target().test_target()
- }
- )+
- }
};
}
--
2.50.1 (Apple Git-155)

View File

@@ -1,9 +1,3 @@
-------------------------------------------------------------------
Sun Oct 26 03:24:33 UTC 2025 - William Brown <william.brown@suse.com>
- bsc#1252698 - define default linker when versioned gcc is in use
- 0001-Disable-broken-linker-tests.patch
-------------------------------------------------------------------
Fri Oct 3 05:40:12 UTC 2025 - William Brown <william.brown@suse.com>

View File

@@ -21,13 +21,13 @@
%global version_current 1.90.0
%global version_previous 1.89.0
%if 0%{?gcc_version} < 14
%if 0%{?gcc_version} < 15
# We may need a minimum gcc version for some linker flags
# This is especially true on leap/sle
#
# ⚠️ 11 or greater is required for a number of linker flags to be supported in sle.
#
%global need_gcc_version 14
%global need_gcc_version 15
%endif
# Use correct python-version for SLE-12
@@ -294,8 +294,10 @@ Patch0: ignore-Wstring-conversion.patch
Patch3: 0001-Disable-pidfs-tests-for-15SP3.patch
%endif
# Can't disable these tests individually
Patch4: 0001-Disable-broken-linker-tests.patch
# PATCH-FIX-UPSTREAM - Don't always panic if WASI_SDK_PATH is not set when detecting compilers
# Patch4: 0001-Don-t-always-panic-if-WASI_SDK_PATH-is-not-set.patch
# PATCH-FIX-UPSTREAM - Don't include current rustc version string in feature removed help
# Patch5: 0001-Don-t-include-current-rustc-version-string-in-featur.patch
BuildRequires: chrpath
BuildRequires: curl
@@ -506,22 +508,11 @@ df -h
# If the environments between build and install and different,
# everything will be rebuilt during installation!
%if %{with llvmtools}
%define rlinker clang
%else
%if 0%{?need_gcc_version} != 0
%define rlinker gcc-%{need_gcc_version}
%else
%define rlinker cc
%endif
%endif
%if %{with llvmtools}
cat > .env.sh <<EOF
export CC="/usr/bin/clang"
export CXX="/usr/bin/clang++"
export RUSTFLAGS="%{rustflags} -Clinker=%{rlinker}"
export RUSTFLAGS="%{rustflags} -Clinker=clang"
EOF
%else
@@ -529,13 +520,13 @@ EOF
cat > .env.sh <<EOF
export CC="/usr/bin/gcc-%{need_gcc_version}"
export CXX="/usr/bin/g++-%{need_gcc_version}"
export RUSTFLAGS="%{rustflags} -Clinker=%{rlinker}"
export RUSTFLAGS="%{rustflags} -Clinker=gcc-%{need_gcc_version}"
EOF
%else
cat > .env.sh <<EOF
export CC="gcc"
export CXX="g++"
export RUSTFLAGS="%{rustflags} -Clinker=%{rlinker}"
export RUSTFLAGS="%{rustflags}"
EOF
%endif
@@ -599,8 +590,7 @@ RUSTC_LOG=rustc_codegen_ssa::back::link=info %{rust_root}/bin/rustc -C link-args
%{!?with_test: --local-rust-root=%{rust_root} --disable-rpath} \
--disable-llvm-link-shared --set llvm.link-jobs=0 \
--set target.%{rust_triple}.profiler=true \
%{?with_llvmtools: --set llvm.use-linker=lld } \
--default-linker=%{rlinker} \
%{?with_llvmtools: --set llvm.use-linker=lld --default-linker=clang } \
--set rust.lld=true \
%{?with_sccache: --enable-sccache} \
%{!?with_sccache: --enable-ccache} \