Auto merge of #7158 - infinity0:master, r=alexcrichton

Work around rust-lang/rust#61440
rust-lang · Jul 23, 2019 · 2b9b7e9 · 2b9b7e9
2 parents 9f7bd62 + b64db39
commit 2b9b7e9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/tests/testsuite/fix.rs b/tests/testsuite/fix.rs
@@ -412,7 +412,7 @@ fn specify_rustflags() {
 [FINISHED] [..]
 ";
  p.cargo("fix --edition --allow-no-vcs")
- .env("RUSTFLAGS", "-C target-cpu=native")
+ .env("RUSTFLAGS", "-C linker=cc")
  .with_stderr(stderr)
  .with_stdout("")
  .run();

diff --git a/tests/testsuite/freshness.rs b/tests/testsuite/freshness.rs
@@ -1153,7 +1153,7 @@ fn changing_rustflags_is_cached() {
 
  p.cargo("build").run();
  p.cargo("build")
- .env("RUSTFLAGS", "-C target-cpu=native")
+ .env("RUSTFLAGS", "-C linker=cc")
  .with_stderr(
  "\
 [COMPILING] foo v0.0.1 ([..])
@@ -1165,7 +1165,7 @@ fn changing_rustflags_is_cached() {
  .with_stderr("[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]")
  .run();
  p.cargo("build")
- .env("RUSTFLAGS", "-C target-cpu=native")
+ .env("RUSTFLAGS", "-C linker=cc")
  .with_stderr("[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]")
  .run();
 }
@@ -1191,7 +1191,7 @@ fn update_dependency_mtime_does_not_rebuild() {
 
  p.cargo("build -Z mtime-on-use")
  .masquerade_as_nightly_cargo()
- .env("RUSTFLAGS", "-C target-cpu=native")
+ .env("RUSTFLAGS", "-C linker=cc")
  .with_stderr(
  "\
 [COMPILING] bar v0.0.1 ([..])
@@ -1202,13 +1202,13 @@ fn update_dependency_mtime_does_not_rebuild() {
  // This does not make new files, but it does update the mtime of the dependency.
  p.cargo("build -p bar -Z mtime-on-use")
  .masquerade_as_nightly_cargo()
- .env("RUSTFLAGS", "-C target-cpu=native")
+ .env("RUSTFLAGS", "-C linker=cc")
  .with_stderr("[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]")
  .run();
  // This should not recompile!
  p.cargo("build -Z mtime-on-use")
  .masquerade_as_nightly_cargo()
- .env("RUSTFLAGS", "-C target-cpu=native")
+ .env("RUSTFLAGS", "-C linker=cc")
  .with_stderr("[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]")
  .run();
 }
@@ -1269,7 +1269,7 @@ fn fingerprint_cleaner_does_not_rebuild() {
  .run();
  p.cargo("build -Z mtime-on-use")
  .masquerade_as_nightly_cargo()
- .env("RUSTFLAGS", "-C target-cpu=native")
+ .env("RUSTFLAGS", "-C linker=cc")
  .with_stderr(
  "\
 [COMPILING] bar v0.0.1 ([..])
@@ -1287,14 +1287,14 @@ fn fingerprint_cleaner_does_not_rebuild() {
  // This does not make new files, but it does update the mtime.
  p.cargo("build -Z mtime-on-use")
  .masquerade_as_nightly_cargo()
- .env("RUSTFLAGS", "-C target-cpu=native")
+ .env("RUSTFLAGS", "-C linker=cc")
  .with_stderr("[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]")
  .run();
  fingerprint_cleaner(p.target_debug_dir(), timestamp);
  // This should not recompile!
  p.cargo("build -Z mtime-on-use")
  .masquerade_as_nightly_cargo()
- .env("RUSTFLAGS", "-C target-cpu=native")
+ .env("RUSTFLAGS", "-C linker=cc")
  .with_stderr("[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]")
  .run();
  // But this should be cleaned and so need a rebuild