Skip to content

Commit 0dce3f6

Browse files
committed
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
2 parents 430feb2 + 60594b1 commit 0dce3f6

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

src/bootstrap/cc_detect.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ pub fn find(build: &mut Build) {
129129
set_compiler(&mut cfg, Language::CPlusPlus, target, config, build);
130130
true
131131
} else {
132-
false
132+
// Use an auto-detected compiler (or one configured via `CXX_target_triple` env vars).
133+
cfg.try_get_compiler().is_ok()
133134
};
134135

135136
// for VxWorks, record CXX compiler which will be used in lib.rs:linker()

src/bootstrap/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,7 @@ note: if you're sure you want to do this, please open an issue as to why. In the
12021202

12031203
// Only pass correct values for these flags for the `run-make` suite as it
12041204
// requires that a C++ compiler was configured which isn't always the case.
1205-
if !builder.config.dry_run && suite == "run-make-fulldeps" {
1205+
if !builder.config.dry_run && matches!(suite, "run-make" | "run-make-fulldeps") {
12061206
cmd.arg("--cc")
12071207
.arg(builder.cc(target))
12081208
.arg("--cxx")

src/test/run-make-fulldeps/issue-36710/Makefile src/test/run-make/issue-36710/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
-include ../tools.mk
1+
include ../../run-make-fulldeps/tools.mk
22

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

55
all: foo
66
$(call RUN,foo)

0 commit comments

Comments
 (0)