rustc wrapper respects CARGO_BUILD_TARGET
#421
Conversation
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
giordano
reviewed
Apr 8, 2025
| @@ -743,8 +743,8 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr | |||
| function rustc(io::IO, p::AbstractPlatform) | |||
| extra_cmds = """ | |||
| if [[ " \${ARGS[@]} " == *'--target'* ]]; then | |||
| if ! [[ " \${ARGS[@]} " =~ --target(=| )$(map_rust_target(p)) ]]; then | |||
| echo "Attempting to invoke targeted 'rustc' wrapper with a different target! (Expected $(map_rust_target(p)))" >&2 | |||
| if ! [[ " \${ARGS[@]} " =~ --target(=| )\${CARGO_BUILD_TARGET} ]]; then | |||
|
hm, I'm getting in https://buildkite.com/julialang/yggdrasil/builds/19293#019612bb-7055-4dd9-b309-95acdc4cdd2c/684-846 using this PR, is it somehow passing that literal string instead of interpolating? |
giordano
reviewed
Apr 8, 2025
src/Runner.jl
Outdated
| if ! [[ " \${ARGS[@]} " =~ --target(=| )$(map_rust_target(p)) ]]; then | ||
| echo "Attempting to invoke targeted 'rustc' wrapper with a different target! (Expected $(map_rust_target(p)))" >&2 | ||
| if ! [[ " \${ARGS[@]} " =~ --target(=| )\${CARGO_BUILD_TARGET} ]]; then | ||
| echo "Attempting to invoke targeted 'rustc' wrapper with a different target! (Expected \${CARGO_BUILD_TARGET}, which is `CARGO_BUILD_TARGET`)" >&2 |
There was a problem hiding this comment.
Don't use backticks, they're doing command substitution inside double quotes
|
ah figured it out with the help of shell syntax highlighting (copied the snippet into a new textfile..). Single quotes don't allow env interpolation. |
giordano
reviewed
Apr 8, 2025
| if ! [[ " \${ARGS[@]} " =~ --target(=| )$(map_rust_target(p)) ]]; then | ||
| echo "Attempting to invoke targeted 'rustc' wrapper with a different target! (Expected $(map_rust_target(p)))" >&2 | ||
| if ! [[ " \${ARGS[@]} " =~ --target(=| )\${CARGO_BUILD_TARGET} ]]; then | ||
| echo "Attempting to invoke targeted 'rustc' wrapper with a different target! (Expected \${CARGO_BUILD_TARGET}, which is CARGO_BUILD_TARGET)" >&2 |
There was a problem hiding this comment.
But I don't understand this message now. It'd read something like
(Expected x86_64-unknown-linux-gnu, which is CARGO_BUILD_TARGET)
There was a problem hiding this comment.
I wanted to say why it expects that. Would this be better?
Suggested change
| echo "Attempting to invoke targeted 'rustc' wrapper with a different target! (Expected \${CARGO_BUILD_TARGET}, which is CARGO_BUILD_TARGET)" >&2 | |
| echo "Attempting to invoke targeted 'rustc' wrapper with a different target! (Expected CARGO_BUILD_TARGET=\${CARGO_BUILD_TARGET})" >&2 |
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.
xref https://julialang.slack.com/archives/C674ELDNX/p1744069809587769?thread_ts=1744068420.505269&cid=C674ELDNX and JuliaPackaging/Yggdrasil#10853