Auto merge of #77901 - jonas-schievink:unignore-test-36710, r=Mark-Simulacrum

Unignore test for #36710 on MUSL

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

Closes #36710
This commit is contained in:
bors 2020-10-25 16:37:01 +00:00
commit 0dce3f606e
5 changed files with 5 additions and 4 deletions

View file

@ -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()

View file

@ -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")

View file

@ -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)