Skip to content

Commit

Permalink
Update Build methods to use getenv_boolean
Browse files Browse the repository at this point in the history
And update getenv_boolean, to treat "false" as false.
  • Loading branch information
NobodyXu authored Oct 6, 2024
1 parent 6298100 commit 17d135b
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1857,7 +1857,7 @@ impl Build {
let mut cmd = self.get_base_compiler()?;

// Disable default flag generation via `no_default_flags` or environment variable
let no_defaults = self.no_default_flags || self.getenv("CRATE_CC_NO_DEFAULTS").is_some();
let no_defaults = self.no_default_flags || self.getenv_boolean("CRATE_CC_NO_DEFAULTS");

if !no_defaults {
self.add_default_flags(&mut cmd, &target, &opt_level)?;
Expand Down Expand Up @@ -3668,15 +3668,12 @@ impl Build {
}

fn get_debug(&self) -> bool {
self.debug.unwrap_or_else(|| match self.getenv("DEBUG") {
Some(s) => &*s != "false",
None => false,
})
self.debug.unwrap_or_else(|| self.getenv_boolean("DEBUG"))
}

fn get_shell_escaped_flags(&self) -> bool {
self.shell_escaped_flags
.unwrap_or_else(|| self.getenv("CC_SHELL_ESCAPED_FLAGS").is_some())
.unwrap_or_else(|| self.getenv_boolean("CC_SHELL_ESCAPED_FLAGS"))
}

fn get_dwarf_version(&self) -> Option<u32> {
Expand Down Expand Up @@ -3755,7 +3752,7 @@ impl Build {
/// get boolean flag that is either true or false
fn getenv_boolean(&self, v: &str) -> bool {
match self.getenv(v) {
Some(s) => s != "0",
Some(s) => s != "0" && s != "false",
None => false,
}
}
Expand Down

0 comments on commit 17d135b

Please sign in to comment.