Avoid overriding WORK_DIR for toolchain #5671
Open
Conversation
This file contains 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
th0ma7
reviewed
Mar 19, 2023
Comment on lines
-597
to
+595
| $(MAKE) REQUIRE_KERNEL_MODULE= REQUIRE_KERNEL= WORK_DIR=$(PWD)/work-$* $(addprefix build-arch-, $*) | ||
| $(MAKE) REQUIRE_KERNEL_MODULE= REQUIRE_KERNEL= $(addprefix build-arch-, $(or $(filter $(addprefix %, $(DEFAULT_TC)), $(filter %$(word 2,$(subst -, ,$*)), $(filter $(firstword $(subst -, ,$*))%, $(AVAILABLE_TOOLCHAINS)))),$*)) |
There was a problem hiding this comment.
besides removing WORK_DIR what does the remaining portion do? Presuming alignment with other similar call previously?
There was a problem hiding this comment.
My understanding is that, for the target arch-XXXX-YYYY, it looks through AVAILABLE_TOOLCHAINS for one which starts with XXXX and ends with both YYYY and DEFAULT_TC, which should give XXXX-YYYY or nothing, in which case it falls back to XXXX-YYYY anyway.
For arch-XXXX, it looks through AVAILABLE_TOOLCHAINS for one which starts with XXXX and ends with DEFAULT_TC, so it should end up picking XXXX-DEFAULT_TC.
Previously the latter case wouldn't build at all, you had to specify the toolchain version in the make target.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Overriding WORK_DIR has undesirable side effects, e.g. the toolchain has to be unpacked again.
I guess it was added because the spk
WORK_DIRwasn't being deduced correctly - this should be fixed by including the toolchain version inbuild-arch-%. As a bonus you can now saymake arch-{ARCH}ifDEFAULT_TCis set.I also removed some cleanup code when building kernel modules. This doesn't seem necessary, and rebuilding after deleting the toolchain gives me warnings about rustup already being installed. I've only been building things for 1 architecture though, so if this change causes issues I'm happy to remove it from the PR.
Checklist
all-supportedcompleted successfullyType of change