Skip to content

build: Scope RUST_VERSION var to single target#25960

Merged
camscale merged 1 commit intomasterfrom
camh/scope-makefile-rust-version
May 9, 2023
Merged

build: Scope RUST_VERSION var to single target#25960
camscale merged 1 commit intomasterfrom
camh/scope-makefile-rust-version

Conversation

@camscale
Copy link
Copy Markdown
Contributor

@camscale camscale commented May 9, 2023

Scope the RUST_VERSION variable to the single
rustup-install-target-toolchain target that needs it. Setting it at
the top-level causes a strange interaction between the top-level
Makefile and the one in build.assets/ that causes make fix-imports
(and presumably any other target that chains to build.assets/Makefile
and uses RUST_VERSION) to get an empty RUST_VERSION.

We use := when setting RUST_VERSION otherwise the same problem is
present but just for the rustup-install-target-toolchain target.

@camscale camscale requested a review from GavinFrazar May 9, 2023 21:33
@camscale camscale force-pushed the camh/scope-makefile-rust-version branch 2 times, most recently from 39d1e09 to c0fb9f5 Compare May 9, 2023 21:56
Scope the `RUST_VERSION` variable to the single
`rustup-install-target-toolchain` target that needs it. Setting it at
the top-level causes a strange interaction between the top-level
Makefile and the one in `build.assets/` that causes `make fix-imports`
(and presumably any other target that chains to `build.assets/Makefile`
and uses `RUST_VERSION`) to get an empty `RUST_VERSION`.

We use `:=` when setting `RUST_VERSION` otherwise the same problem is
present but just for the `rustup-install-target-toolchain` target.
@camscale camscale force-pushed the camh/scope-makefile-rust-version branch from c0fb9f5 to d899b82 Compare May 9, 2023 21:59
@camscale camscale added this pull request to the merge queue May 9, 2023
Merged via the queue into master with commit ad52352 May 9, 2023
@camscale camscale deleted the camh/scope-makefile-rust-version branch May 9, 2023 22:40
@public-teleport-github-review-bot
Copy link
Copy Markdown

@camscale See the table below for backport results.

Branch Result
branch/v13 Create PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants