Prevent compiletest from overriding the linker for cross-built tests#159059
Open
kulst wants to merge 1 commit into
Open
Prevent compiletest from overriding the linker for cross-built tests#159059kulst wants to merge 1 commit into
kulst wants to merge 1 commit into
Conversation
Compiletest already avoids passing its default `--target` when a test provides one explicitly through compile-flags. However, it would still pass the globally configured target linker via `-Clinker`. This is problematic for cross-built tests, where the effective compilation target can differ from compiletest's configured target. For example, when compiletest is running with `x86_64-unknown-linux-musl` as its configured target, a test that explicitly compiles for `nvptx64-nvidia-cuda` can incorrectly inherit the musl linker. Avoid passing the configured target linker when the test provides a custom `--target`, so cross-built tests can use their target's linker defaults or test-provided linker flags.
Collaborator
|
Some changes occurred in src/tools/compiletest cc @jieyouxu |
Collaborator
|
r? @wesleywiser rustbot has assigned @wesleywiser. Use Why was this reviewer chosen?The reviewer was selected based on:
|
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
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.
Compiletest already avoids passing its default
--targetwhen a test provides one explicitly through compile-flags. However, it would still pass the globally configured target linker via-Clinker.This is problematic for cross-built tests, where the effective compilation target can differ from compiletest's configured target. For example, when compiletest is running with
x86_64-unknown-linux-muslas its configured target, a test that explicitly compiles fornvptx64-nvidia-cudacan incorrectly inherit the musl linker (reference).With this patch the configured target linker is only passed, when the test does not contain a custom
--target.In terms of testing compiletest, a direct unit test would be ideal here. However,
make_compile_argsis currently difficult to exercise in isolation because it depends on a fully constructedTestCx. Adding such a test would require either non-trivial test setup or a refactor to make the argument construction testable. Therefore, I did not add a test here.