Skip to content

Fix --use-system-gcc option handling #609

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
merged 1 commit into from
Jan 24, 2025
Merged

Fix --use-system-gcc option handling #609

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions build_system/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,12 +320,16 @@ impl ConfigInfo {
) -> Result<(), String> {
env.insert("CARGO_INCREMENTAL".to_string(), "0".to_string());

if self.gcc_path.is_none() && !use_system_gcc {
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",
);
let gcc_path = if !use_system_gcc {
if self.gcc_path.is_none() {
self.setup_gcc_path()?;
}
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());

if self.cargo_target_dir.is_empty() {
Expand Down