Skip to content

rustc wrapper respects CARGO_BUILD_TARGET #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

rustc wrapper respects CARGO_BUILD_TARGET #421

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66ac136
rustc wrapper respects `CARGO_BUILD_TARGET`
ericphanson Apr 7, 2025
abfb732
set in `--target` too
ericphanson Apr 8, 2025
95fa38e
use double-quotes for interpolation, avoid backticks
ericphanson Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Runner.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,13 +743,13 @@ 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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also below

echo "Attempting to invoke targeted 'rustc' wrapper with a different target! (Expected \${CARGO_BUILD_TARGET}, which is CARGO_BUILD_TARGET)" >&2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But I don't understand this message now. It'd read something like

(Expected x86_64-unknown-linux-gnu, which is CARGO_BUILD_TARGET)

Copy link
Author

@ericphanson ericphanson Apr 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

echo "args: \${ARGS[@]}" >&2
exit 1
fi
else
PRE_FLAGS+=( '--target=$(map_rust_target(p))' )
PRE_FLAGS+=( "--target=\${CARGO_BUILD_TARGET}" )
fi
"""
wrapper(io, "/opt/$(host_target)/bin/rustc"; flags=rust_flags!(p), allow_ccache=false, extra_cmds=extra_cmds)
Expand Down
Loading