Skip to content

[v13] build: Scope RUST_VERSION var to single target #25962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
camscale merged 2 commits into from
May 10, 2023
Merged

[v13] build: Scope RUST_VERSION var to single target #25962

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acd4bfd
build: Scope RUST_VERSION var to single target
camscale May 9, 2023
496648f
Merge branch 'branch/v13' into bot/backport-25960-branch/v13
camscale May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ TARBINS = $(addprefix teleport/,$(BINS))
CHECK_CARGO := $(shell cargo --version 2>/dev/null)
CHECK_RUST := $(shell rustc --version 2>/dev/null)

RUST_VERSION ?= $(shell make --no-print-directory -C build.assets print-rust-version)
RUST_TARGET_ARCH ?= $(CARGO_TARGET_$(OS)_$(ARCH))

# Have cargo use sparse crates.io protocol:
Expand Down Expand Up @@ -1331,6 +1330,7 @@ docker-ui:
# defined in build.assets/Makefile. It assumes that `rustup` is already
# installed for managing the rust toolchain.
.PHONY: rustup-install-target-toolchain
rustup-install-target-toolchain: RUST_VERSION := $(shell $(MAKE) --no-print-directory -C build.assets print-rust-version)
rustup-install-target-toolchain:
rustup override set $(RUST_VERSION)
rustup target add $(RUST_TARGET_ARCH)