Skip to content
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

Jump to bottom

Inform build scripts of rustc compiler context #9601

Merged
merged 19 commits into from
Jul 20, 2021
Merged

Inform build scripts of rustc compiler context #9601

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6ee606b
Inform build scripts of rustc compiler context
Jun 18, 2021
bdf49cb
Don't set RUSTC_WRAPPER if not configured
Jun 18, 2021
44491ee
Document build script envvars for rustc context
Jun 18, 2021
719eb59
Add tests for rustc context build script env vars
Jun 18, 2021
8012d32
Avoid coercing path to string for windows
Jun 18, 2021
1e40745
Remove CARGO_ prefix for new build script envvars
Jun 24, 2021
49d33c4
Expose cargo and rustc version envvars
Jun 24, 2021
055a243
Ensure RUSTC_WRAPPER isn't set if no wrapper is used
Jun 25, 2021
715fab4
Update docs
Jun 25, 2021
c16b9d4
Remove CARGO_VERSION* env vars
Jun 25, 2021
fb0d41f
Adopt CARGO_ENCODED_RUSTFLAGS
Jun 29, 2021
fa7c5b1
Use a more standard linker flag
Jun 29, 2021
a01c5dd
Ignore empty rustflags
Jun 29, 2021
8199f85
Update src/cargo/core/compiler/build_context/target_info.rs
jonhoo Jun 29, 2021
f927d2a
Don't filter empty arguments with encoded rustflags
Jun 30, 2021
d6b4a06
Also set RUSTC_WORKSPACE_WRAPPER for build.rs
Jul 6, 2021
d0c751b
Test when RUSTC_WORKSPACE_WRAPPER is not set
Jul 12, 2021
9313266
RUSTC_VERSION != CARGO_VERSION
Jul 14, 2021
1cbce47
Remove RUSTC_VERSION envvar
Jul 16, 2021
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
Prev Previous commit
Next Next commit
Don't set RUSTC_WRAPPER if not configured
  • Loading branch information
Jon Gjengset committed Jun 18, 2021
commit bdf49cb17599a4cd8cb5578da0ca6bfa844a8971
7 changes: 3 additions & 4 deletions src/cargo/core/compiler/custom_build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,9 @@ fn build_work(cx: &mut Context<'_, '_>, unit: &Unit) -> CargoResult<Job> {
}

// Also inform the build script of the rustc compiler context.
cmd.env(
"CARGO_RUSTC_WRAPPER",
bcx.rustc().wrapper.as_deref().unwrap_or(Path::new("")),
);
if let Some(wrapper) = bcx.rustc().wrapper.as_ref() {
cmd.env("CARGO_RUSTC_WRAPPER", wrapper);
jonhoo marked this conversation as resolved.
Show resolved Hide resolved
}
jonhoo marked this conversation as resolved.
Show resolved Hide resolved
cmd.env("CARGO_RUSTFLAGS", bcx.rustflags_args(unit).join(" "));

// Gather the set of native dependencies that this package has along with
Expand Down