Skip to content

Commit b74b66f

Browse files
committed
tests: build: rust: update the config selection
Update the build features which Rust 1.83 (Fedora 41) is not compatible with. Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 07ebcd3 commit b74b66f

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

tests/patch/build_clang_rust/build_clang_rust.sh

+2-5
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,12 @@ prep_config() {
2828
./scripts/config --file $output_dir/.config -d randstruct_full
2929
./scripts/config --file $output_dir/.config -e randstruct_none
3030
./scripts/config --file $output_dir/.config -d modversions
31+
# Rust also seems currently incompatible with CFI (Rust 1.83)
32+
./scripts/config --file $output_dir/.config -d cfi_clang
3133

3234
# Now Rust can be enabled
3335
./scripts/config --file $output_dir/.config -e rust
3436

35-
# The Rust compiler does not play nicely with the kernel workarounds
36-
# for speculation attacks. So turn off RETHUNK and X86_KERNEL_IBT
37-
./scripts/config --file $output_dir/.config -d rethunk
38-
./scripts/config --file $output_dir/.config -d x86_kernel_ibt
39-
4037
# Rust currently requires all dependencies are built in, so make
4138
# phylib built in.
4239
./scripts/config --file $output_dir/.config -e phylib

0 commit comments

Comments
 (0)