[v13] build: Scope RUST_VERSION var to single target#25962
Merged
camscale merged 2 commits intobranch/v13from May 10, 2023
Merged
[v13] build: Scope RUST_VERSION var to single target#25962camscale merged 2 commits intobranch/v13from
camscale merged 2 commits intobranch/v13from
Conversation
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.
zmb3
approved these changes
May 9, 2023
GavinFrazar
approved these changes
May 10, 2023
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport #25960 to branch/v13
Scope the
RUST_VERSIONvariable to the singlerustup-install-target-toolchaintarget that needs it. Setting it atthe top-level causes a strange interaction between the top-level
Makefile and the one in
build.assets/that causesmake fix-imports(and presumably any other target that chains to
build.assets/Makefileand uses
RUST_VERSION) to get an emptyRUST_VERSION.We use
:=when settingRUST_VERSIONotherwise the same problem ispresent but just for the
rustup-install-target-toolchaintarget.Backport: #25960