diff options
| author | Ralf Jung <post@ralfj.de> | 2017-09-02 10:54:43 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2017-09-02 21:51:18 +0200 |
| commit | 12d84cc0096c60573b8c0d7f14da8fa904e326b6 (patch) | |
| tree | ac3cc2cb72502d7968ebd416c9c8527db1a34291 /src/bootstrap | |
| parent | 204c0a47e7b7e371cf1cdc159404d405b86386ba (diff) | |
| download | rust-12d84cc0096c60573b8c0d7f14da8fa904e326b6.tar.gz rust-12d84cc0096c60573b8c0d7f14da8fa904e326b6.zip | |
update gcc crate
Use gcc::Build rather than deprecated gcc::Config. Fixes #43973
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/bin/sccache-plus-cl.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/cc.rs | 6 | ||||
| -rw-r--r-- | src/bootstrap/native.rs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/bootstrap/bin/sccache-plus-cl.rs b/src/bootstrap/bin/sccache-plus-cl.rs index cf0c1274923..5684a565a9c 100644 --- a/src/bootstrap/bin/sccache-plus-cl.rs +++ b/src/bootstrap/bin/sccache-plus-cl.rs @@ -18,7 +18,7 @@ fn main() { // Locate the actual compiler that we're invoking env::remove_var("CC"); env::remove_var("CXX"); - let mut cfg = gcc::Config::new(); + let mut cfg = gcc::Build::new(); cfg.cargo_metadata(false) .out_dir("/") .target(&target) diff --git a/src/bootstrap/cc.rs b/src/bootstrap/cc.rs index 0f25da8a238..2541950d6c7 100644 --- a/src/bootstrap/cc.rs +++ b/src/bootstrap/cc.rs @@ -45,7 +45,7 @@ pub fn find(build: &mut Build) { // For all targets we're going to need a C compiler for building some shims // and such as well as for being a linker for Rust code. for target in build.targets.iter().chain(&build.hosts).cloned().chain(iter::once(build.build)) { - let mut cfg = gcc::Config::new(); + let mut cfg = gcc::Build::new(); cfg.cargo_metadata(false).opt_level(0).debug(false) .target(&target).host(&build.build); @@ -67,7 +67,7 @@ pub fn find(build: &mut Build) { // For all host triples we need to find a C++ compiler as well for host in build.hosts.iter().cloned().chain(iter::once(build.build)) { - let mut cfg = gcc::Config::new(); + let mut cfg = gcc::Build::new(); cfg.cargo_metadata(false).opt_level(0).debug(false).cpp(true) .target(&host).host(&build.build); let config = build.config.target_config.get(&host); @@ -82,7 +82,7 @@ pub fn find(build: &mut Build) { } } -fn set_compiler(cfg: &mut gcc::Config, +fn set_compiler(cfg: &mut gcc::Build, gnu_compiler: &str, target: Interned<String>, config: Option<&Target>, diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 8173903c034..0d1bcabc745 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -289,7 +289,7 @@ impl Step for TestHelpers { let _folder = build.fold_output(|| "build_test_helpers"); println!("Building test helpers"); t!(fs::create_dir_all(&dst)); - let mut cfg = gcc::Config::new(); + let mut cfg = gcc::Build::new(); // We may have found various cross-compilers a little differently due to our // extra configuration, so inform gcc of these compilers. Note, though, that |
