Skip to content

Commit 82f73ef

Browse files
committed
Override the Rust version to use the same as the one from the repo of rustc_codegen_gcc
1 parent c44a903 commit 82f73ef

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,11 @@ jobs:
114114
115115
git clone --depth 1 https://github.com/rust-lang/rustc_codegen_gcc
116116
117+
# Since we use rustc_codegen_gcc from the master branch of the repo, but don't use y.sh in make to build using rustc_codegen_gcc,
118+
# we need to override the rust version.
119+
rust_version=$(grep channel rustc_codegen_gcc/rust-toolchain | cut -f3 -d' ' | sed 's/"//g')
120+
rustup override set $rust_version
121+
117122
echo "MAKE_KRUSTFLAGS=KRUSTFLAGS=-Zcodegen-backend=$(pwd)/rustc_codegen_gcc/target/release/librustc_codegen_gcc.so" >> $GITHUB_ENV
118123
119124

0 commit comments

Comments
 (0)