Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Improve the semantics of Build::env #1682

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

Merged
NobodyXu merged 6 commits into from
Mar 12, 2026
Merged

Improve the semantics of Build::env #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc69458
Refactor CC_FORCE_DISABLE reading
madsmtm Mar 6, 2026
2ebdb5e
Split Build::getenv
madsmtm Feb 27, 2026
d9e4c8e
Make Build::env also set variables on tools and commands
madsmtm Mar 7, 2026
30315a5
Cleanup
madsmtm Mar 9, 2026
2e5e130
Document which in-process env-vars Build::env overrides
madsmtm Mar 11, 2026
9d8a8bb
Add link
madsmtm Mar 11, 2026
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
8 changes: 2 additions & 6 deletions src/command_helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use std::{
},
};

use crate::{Error, ErrorKind, Object};
use crate::{utilities::cargo_env_var_os, Error, ErrorKind, Object};

#[derive(Clone, Debug)]
pub(crate) struct CargoOutput {
Expand Down Expand Up @@ -308,11 +308,7 @@ pub(crate) fn objects_from_files(files: &[Arc<Path>], dst: &Path) -> Result<Vec<

// Make the dirname relative (if possible) to avoid full system paths influencing the sha
// and making the output system-dependent
//
// NOTE: Here we allow using std::env::var (instead of Build::getenv) because
// CARGO_* variables always trigger a rebuild when changed
#[allow(clippy::disallowed_methods)]
let dirname = if let Some(root) = std::env::var_os("CARGO_MANIFEST_DIR") {
let dirname = if let Some(root) = cargo_env_var_os("CARGO_MANIFEST_DIR") {
let root = root.to_string_lossy();
Cow::Borrowed(dirname.strip_prefix(&*root).unwrap_or(&dirname))
} else {
Expand Down
Loading
Loading