From 8de3ddf8d8140175f936bebdedd5c40fdc949450 Mon Sep 17 00:00:00 2001 From: Kristofer Rye Date: Mon, 27 May 2019 16:44:16 -0500 Subject: [PATCH 1/3] Remove *ios* case from print-target-list Makefile Based on the TODO, this case was added to short-circuit for ios builds, which is no longer necessary. The comment in this Makefile mentions rust-lang/rust#29812 as a dependency, but that issue has been since closed, with a statement that the ICE of concern was resolved circa 1.12. Here we remove this case, and just run the same branch for all targets. Signed-off-by: Kristofer Rye --- src/test/run-make-fulldeps/print-target-list/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/test/run-make-fulldeps/print-target-list/Makefile b/src/test/run-make-fulldeps/print-target-list/Makefile index 144c5ba10cccf..c624b9b491d66 100644 --- a/src/test/run-make-fulldeps/print-target-list/Makefile +++ b/src/test/run-make-fulldeps/print-target-list/Makefile @@ -2,12 +2,9 @@ # Checks that all the targets returned by `rustc --print target-list` are valid # target specifications -# TODO remove the '*ios*' case when rust-lang/rust#29812 is fixed all: for target in $(shell $(BARE_RUSTC) --print target-list); do \ case $$target in \ - *ios*) \ - ;; \ *) \ $(BARE_RUSTC) --target $$target --print sysroot \ ;; \ From 57cea25151238517375c200b22772528828133a2 Mon Sep 17 00:00:00 2001 From: Kristofer Rye Date: Mon, 27 May 2019 16:52:54 -0500 Subject: [PATCH 2/3] Remove now-dead case statement in print-target-list Makefile Since this case statement no longer has any branches, remove it. Signed-off-by: Kristofer Rye --- src/test/run-make-fulldeps/print-target-list/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/test/run-make-fulldeps/print-target-list/Makefile b/src/test/run-make-fulldeps/print-target-list/Makefile index c624b9b491d66..b66b5d0422d13 100644 --- a/src/test/run-make-fulldeps/print-target-list/Makefile +++ b/src/test/run-make-fulldeps/print-target-list/Makefile @@ -4,9 +4,5 @@ # target specifications all: for target in $(shell $(BARE_RUSTC) --print target-list); do \ - case $$target in \ - *) \ - $(BARE_RUSTC) --target $$target --print sysroot \ - ;; \ - esac \ + $(BARE_RUSTC) --target $$target --print sysroot \ done From e0f017da75da3686e5186b6f1ce9a39a0f8d2aa2 Mon Sep 17 00:00:00 2001 From: Kristofer Rye Date: Mon, 27 May 2019 19:40:11 -0500 Subject: [PATCH 3/3] Fix an sh error Didn't think it was this particular about things, but I also should have tested locally. It makes sense, though---`\` followed by LF would eat it, so we'd have `sysroot done` instead of `sysroot; done` as it is parsed. This should pass now. Signed-off-by: Kristofer Rye Tested-by: Kristofer Rye --- src/test/run-make-fulldeps/print-target-list/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/run-make-fulldeps/print-target-list/Makefile b/src/test/run-make-fulldeps/print-target-list/Makefile index b66b5d0422d13..5f10f2aa3b0f4 100644 --- a/src/test/run-make-fulldeps/print-target-list/Makefile +++ b/src/test/run-make-fulldeps/print-target-list/Makefile @@ -4,5 +4,5 @@ # target specifications all: for target in $(shell $(BARE_RUSTC) --print target-list); do \ - $(BARE_RUSTC) --target $$target --print sysroot \ + $(BARE_RUSTC) --target $$target --print sysroot; \ done