romenskiy2012/tuwunel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

docker: Use prefix match for nightly rust_toolchain settings.

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-10-28 13:20:49 +00:00
parent 3694ffbab3
commit 1cf4a26ae9
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docker/bake.hcl
View file

@ -1390,7 +1390,7 @@ target "deps-base" {
"-C link-arg=-l:libgcc.a": "", "-C link-arg=-l:libgcc.a": "",
]): ]):
(cargo_profile == "release" || cargo_profile == "bench") && rust_toolchain == "nightly"? (cargo_profile == "release" || cargo_profile == "bench") && substr(rust_toolchain, 0, 7) == "nightly"?
join(" ", [ join(" ", [
join(" ", rustflags), join(" ", rustflags),
join(" ", nightly_rustflags), join(" ", nightly_rustflags),
@ -1432,7 +1432,7 @@ target "deps-base" {
"-C link-arg=-l:libgcc.a": "", "-C link-arg=-l:libgcc.a": "",
]): ]):
rust_toolchain == "stable"? substr(rust_toolchain, 0, 6) == "stable"?
join(" ", [ join(" ", [
join(" ", rustflags), join(" ", rustflags),
join(" ", static_rustflags), join(" ", static_rustflags),
@ -1452,7 +1452,7 @@ target "deps-base" {
"-C link-arg=-l:libgcc.a": "", "-C link-arg=-l:libgcc.a": "",
]): ]):
rust_toolchain == "nightly"? substr(rust_toolchain, 0, 7) == "nightly"?
join(" ", [ join(" ", [
join(" ", rustflags), join(" ", rustflags),
join(" ", nightly_rustflags), join(" ", nightly_rustflags),