fix: unfork cc

Gankra · Jul 11, 2024 · f2fa01a · f2fa01a
1 parent f59d38f
commit f2fa01a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -57,7 +57,7 @@ version = "0.3.0"
 
 [workspace.dependencies]
 camino = { version = "1.1.7", features = ["serde1"] }
-cc = { version = "1.0.73", git = "https://github.com/Gankra/cc-rs" }
+cc = { version = "1.1.0" }
 clap = { version = "4.5.4", features = ["cargo", "wrap_help", "derive"] }
 console = "0.15.8"
 kdl = "4.6.0"

diff --git a/src/toolchains/c.rs b/src/toolchains/c.rs
@@ -274,7 +274,12 @@ impl CcToolchain {
             TOOLCHAIN_CLANG => CCFlavor::Clang,
             TOOLCHAIN_MSVC => CCFlavor::Msvc,
             TOOLCHAIN_CC => {
-                let compiler = cc::Build::new().get_compiler();
+                let compiler = cc::Build::new()
+                    .cargo_metadata(false)
+                    .cargo_debug(false)
+                    .cargo_warnings(false)
+                    .cargo_output(false)
+                    .get_compiler();
                 if compiler.is_like_msvc() {
                     CCFlavor::Msvc
                 } else if compiler.is_like_gnu() {
@@ -332,6 +337,9 @@ impl CcToolchain {
             .file(src_path)
             .opt_level(0)
             .cargo_metadata(false)
+            .cargo_debug(false)
+            .cargo_warnings(false)
+            .cargo_output(false)
             .target(built_info::TARGET)
             .out_dir(out_dir)
             // .warnings_into_errors(true)