bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Merge pull request #609 from GuillaumeGomez/fix-use-system-gcc

Browse source 
Fix `--use-system-gcc` option handling
This commit is contained in:
antoyo 2025-01-24 17:02:29 -05:00 • committed by GitHub
commit 9f33f846dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
build_system/src/config.rs
View file

@ -320,12 +320,16 @@ impl ConfigInfo {
) -> Result<(), String> { ) -> Result<(), String> {
env.insert("CARGO_INCREMENTAL".to_string(), "0".to_string()); env.insert("CARGO_INCREMENTAL".to_string(), "0".to_string());
if self.gcc_path.is_none() && !use_system_gcc { let gcc_path = if !use_system_gcc {
self.setup_gcc_path()?; if self.gcc_path.is_none() {
} self.setup_gcc_path()?;
let gcc_path = self.gcc_path.clone().expect( }
"The config module should have emitted an error if the GCC path wasn't provided", self.gcc_path.clone().expect(
); "The config module should have emitted an error if the GCC path wasn't provided",
)
} else {
String::new()
};
env.insert("GCC_PATH".to_string(), gcc_path.clone()); env.insert("GCC_PATH".to_string(), gcc_path.clone());
if self.cargo_target_dir.is_empty() { if self.cargo_target_dir.is_empty() {