Skip to content

Commit

Permalink
Rollup merge of rust-lang#77901 - jonas-schievink:unignore-test-36710…
Browse files Browse the repository at this point in the history
…, r=Mark-Simulacrum

Unignore test for rust-lang#36710 on MUSL

This now works fine thanks to autodetected `-C link-self-contained`.

Closes rust-lang#36710
  • Loading branch information
Dylan-DPC committed Oct 22, 2020
2 parents 7fecaca + 60594b1 commit 80897de
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion src/bootstrap/cc_detect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ pub fn find(build: &mut Build) {
set_compiler(&mut cfg, Language::CPlusPlus, target, config, build);
true
} else {
false
// Use an auto-detected compiler (or one configured via `CXX_target_triple` env vars).
cfg.try_get_compiler().is_ok()
};

// for VxWorks, record CXX compiler which will be used in lib.rs:linker()
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1202,7 +1202,7 @@ note: if you're sure you want to do this, please open an issue as to why. In the

// Only pass correct values for these flags for the `run-make` suite as it
// requires that a C++ compiler was configured which isn't always the case.
if !builder.config.dry_run && suite == "run-make-fulldeps" {
if !builder.config.dry_run && matches!(suite, "run-make" | "run-make-fulldeps") {
cmd.arg("--cc")
.arg(builder.cc(target))
.arg("--cxx")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-include ../tools.mk
include ../../run-make-fulldeps/tools.mk

# ignore-musl
# ignore-32bit wrong/no cross compiler and sometimes we pass wrong gcc args (-m64)

all: foo
$(call RUN,foo)
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 80897de

Please sign in to comment.