Skip to content

Commit

Permalink
fix: unfork cc
Browse files Browse the repository at this point in the history
  • Loading branch information
Gankra committed Jul 8, 2024
1 parent e9e3e24 commit d283ec2
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 9 deletions.
14 changes: 7 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.73", git = "https://github.com/Gankra/cc-rs", branch = "config-out" }
clap = { version = "4.5.4", features = ["cargo", "wrap_help", "derive"] }
console = "0.15.8"
kdl = "4.6.0"
Expand Down
10 changes: 9 additions & 1 deletion src/toolchains/c.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit d283ec2

Please sign in to comment.