From 13a5067061c14875bf1deda44a4740c08e872eb9 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Tue, 13 Oct 2020 16:20:53 +0200 Subject: [PATCH 1/7] Unignore test --- src/test/run-make-fulldeps/issue-36710/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/run-make-fulldeps/issue-36710/Makefile b/src/test/run-make-fulldeps/issue-36710/Makefile index 4f93d97636e60..7eba52f3c24e8 100644 --- a/src/test/run-make-fulldeps/issue-36710/Makefile +++ b/src/test/run-make-fulldeps/issue-36710/Makefile @@ -1,7 +1,5 @@ -include ../tools.mk -# ignore-musl - all: foo $(call RUN,foo) From 0558e6eb9337960a1415e037ae7a44e3aa947479 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Wed, 14 Oct 2020 14:27:49 +0200 Subject: [PATCH 2/7] bootstrap: fall back to auto-detected CXX This allows us to use the C++ compiler configured via `CXX_target_triple` env vars --- src/bootstrap/cc_detect.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs index d50e4cf52697a..e750c2963dddc 100644 --- a/src/bootstrap/cc_detect.rs +++ b/src/bootstrap/cc_detect.rs @@ -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() From 77a7ccf869db577c0d7262965c0ecdd1f50a49b8 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Wed, 14 Oct 2020 14:28:57 +0200 Subject: [PATCH 3/7] bootstrap: configure native toolchain for run-make This allows moving a lot of run-make-fulldeps tests to just run-make tests, and allows running those on target-only platforms --- src/bootstrap/test.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 33e85dc5e2a11..6c2c05ac7197e 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -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") From e36de6b2a1acc2826482f44a46b90678baccaaff Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Wed, 14 Oct 2020 14:29:57 +0200 Subject: [PATCH 4/7] Move issue-36710 test to run-make Somewhat hacky to reuse `tools.mk` like this, we should probably migrate most of them now --- src/test/{run-make-fulldeps => run-make}/issue-36710/Makefile | 2 +- src/test/{run-make-fulldeps => run-make}/issue-36710/foo.cpp | 0 src/test/{run-make-fulldeps => run-make}/issue-36710/foo.rs | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename src/test/{run-make-fulldeps => run-make}/issue-36710/Makefile (80%) rename src/test/{run-make-fulldeps => run-make}/issue-36710/foo.cpp (100%) rename src/test/{run-make-fulldeps => run-make}/issue-36710/foo.rs (100%) diff --git a/src/test/run-make-fulldeps/issue-36710/Makefile b/src/test/run-make/issue-36710/Makefile similarity index 80% rename from src/test/run-make-fulldeps/issue-36710/Makefile rename to src/test/run-make/issue-36710/Makefile index 7eba52f3c24e8..fe8061c013a68 100644 --- a/src/test/run-make-fulldeps/issue-36710/Makefile +++ b/src/test/run-make/issue-36710/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../../run-make-fulldeps/tools.mk all: foo $(call RUN,foo) diff --git a/src/test/run-make-fulldeps/issue-36710/foo.cpp b/src/test/run-make/issue-36710/foo.cpp similarity index 100% rename from src/test/run-make-fulldeps/issue-36710/foo.cpp rename to src/test/run-make/issue-36710/foo.cpp diff --git a/src/test/run-make-fulldeps/issue-36710/foo.rs b/src/test/run-make/issue-36710/foo.rs similarity index 100% rename from src/test/run-make-fulldeps/issue-36710/foo.rs rename to src/test/run-make/issue-36710/foo.rs From a67160494cb9305e72aae5b367d9187f2f37e572 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Wed, 14 Oct 2020 16:25:10 +0200 Subject: [PATCH 5/7] Ignore test on WASM --- src/test/run-make/issue-36710/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/run-make/issue-36710/Makefile b/src/test/run-make/issue-36710/Makefile index fe8061c013a68..ddde078e8f84b 100644 --- a/src/test/run-make/issue-36710/Makefile +++ b/src/test/run-make/issue-36710/Makefile @@ -1,5 +1,7 @@ include ../../run-make-fulldeps/tools.mk +# ignore-wasm32 + all: foo $(call RUN,foo) From d7c7649f5b4688e73046d45293e4d046ade59135 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Fri, 16 Oct 2020 21:49:03 +0200 Subject: [PATCH 6/7] ignore-thumb --- src/test/run-make/issue-36710/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/run-make/issue-36710/Makefile b/src/test/run-make/issue-36710/Makefile index ddde078e8f84b..97a379de0b1b2 100644 --- a/src/test/run-make/issue-36710/Makefile +++ b/src/test/run-make/issue-36710/Makefile @@ -1,6 +1,7 @@ include ../../run-make-fulldeps/tools.mk # ignore-wasm32 +# ignore-thumb all: foo $(call RUN,foo) From 60594b1f0fd0fa69959e4fe56a61c01031916fe2 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Mon, 19 Oct 2020 16:37:53 +0200 Subject: [PATCH 7/7] Ignore on 32-bit targets --- src/test/run-make/issue-36710/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/run-make/issue-36710/Makefile b/src/test/run-make/issue-36710/Makefile index 97a379de0b1b2..b7bf366c918e2 100644 --- a/src/test/run-make/issue-36710/Makefile +++ b/src/test/run-make/issue-36710/Makefile @@ -1,7 +1,6 @@ include ../../run-make-fulldeps/tools.mk -# ignore-wasm32 -# ignore-thumb +# ignore-32bit wrong/no cross compiler and sometimes we pass wrong gcc args (-m64) all: foo $(call RUN,foo)