From 9f2f6a0dfe7df744f7c5c15347335634a51fd260 Mon Sep 17 00:00:00 2001 From: Rosica Dejanovska Date: Fri, 15 Oct 2021 12:30:41 +0200 Subject: [PATCH 1/3] Fix cc path when SYSROOT is specified --- cargo/cargo_build_script_runner/bin.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cargo/cargo_build_script_runner/bin.rs b/cargo/cargo_build_script_runner/bin.rs index 04d89a34d9..f304377f66 100644 --- a/cargo/cargo_build_script_runner/bin.rs +++ b/cargo/cargo_build_script_runner/bin.rs @@ -18,6 +18,7 @@ extern crate cargo_build_script_output_parser; use cargo_build_script_output_parser::{BuildScriptOutput, CompileAndLinkFlags}; use std::collections::BTreeMap; +use std::ffi::OsString; use std::env; use std::fs::{create_dir_all, read_to_string, write}; use std::path::Path; @@ -89,7 +90,7 @@ fn run_buildrs() -> Result<(), String> { } if let Some(cc_path) = env::var_os("CC") { - let mut cc_path = exec_root.join(cc_path); + let mut cc_path = exec_root.join(cc_path).into_os_string(); if let Some(sysroot_path) = env::var_os("SYSROOT") { cc_path.push(" --sysroot="); cc_path.push(&exec_root.join(sysroot_path)); From 52d507e9cc826d8ed66b8fa7cfe9f580d3d57e12 Mon Sep 17 00:00:00 2001 From: Rosica Dejanovska Date: Fri, 15 Oct 2021 12:50:35 +0200 Subject: [PATCH 2/3] Fix Rustfmt failure --- cargo/cargo_build_script_runner/bin.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cargo/cargo_build_script_runner/bin.rs b/cargo/cargo_build_script_runner/bin.rs index f304377f66..69a1c8ef4a 100644 --- a/cargo/cargo_build_script_runner/bin.rs +++ b/cargo/cargo_build_script_runner/bin.rs @@ -18,8 +18,8 @@ extern crate cargo_build_script_output_parser; use cargo_build_script_output_parser::{BuildScriptOutput, CompileAndLinkFlags}; use std::collections::BTreeMap; -use std::ffi::OsString; use std::env; +use std::ffi::OsString; use std::fs::{create_dir_all, read_to_string, write}; use std::path::Path; use std::process::Command; From 0cd853e518aa9b41b4dc0c968211df5f3d2d2a15 Mon Sep 17 00:00:00 2001 From: Rosica Dejanovska Date: Fri, 15 Oct 2021 12:53:53 +0200 Subject: [PATCH 3/3] And clippy failure --- cargo/cargo_build_script_runner/bin.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/cargo/cargo_build_script_runner/bin.rs b/cargo/cargo_build_script_runner/bin.rs index 69a1c8ef4a..baee4ff724 100644 --- a/cargo/cargo_build_script_runner/bin.rs +++ b/cargo/cargo_build_script_runner/bin.rs @@ -19,7 +19,6 @@ extern crate cargo_build_script_output_parser; use cargo_build_script_output_parser::{BuildScriptOutput, CompileAndLinkFlags}; use std::collections::BTreeMap; use std::env; -use std::ffi::OsString; use std::fs::{create_dir_all, read_to_string, write}; use std::path::Path; use std::process::Command;