about summary refs log tree commit diff
path: root/src/test/run-make-fulldeps
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-05-28 18:15:41 +0200
committerGitHub <noreply@github.com>2019-05-28 18:15:41 +0200
commite06547fe8db5e9596de780197c7bcba09b3c9039 (patch)
treed05bc726c40c21be736b11d3d12822813ceb8a0b /src/test/run-make-fulldeps
parent16ef483b79da2bee891d58f5da97456f71573cc0 (diff)
parente0f017da75da3686e5186b6f1ce9a39a0f8d2aa2 (diff)
downloadrust-e06547fe8db5e9596de780197c7bcba09b3c9039.tar.gz
rust-e06547fe8db5e9596de780197c7bcba09b3c9039.zip
Rollup merge of #61250 - rye:print-target-list--rm-ios-case, r=alexcrichton
Remove special case for *ios* builds in run-make-fulldeps/print-target-list Makefile

Previous `TODO` comment in this file mentions [an issue that was closed](https://github.com/rust-lang/rust/issues/29812), and I was able to confirm locally that provided code in that issue no longer produces an ICE. Discussion on that issue seems to indicate this code was no longer needed as of 1.12.0.

I removed the `*ios*` branch from this `case` statement as it may cause confusion, then removed the case statement entirely as it only had a wildcard branch.
Diffstat (limited to 'src/test/run-make-fulldeps')
-rw-r--r--src/test/run-make-fulldeps/print-target-list/Makefile9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/test/run-make-fulldeps/print-target-list/Makefile b/src/test/run-make-fulldeps/print-target-list/Makefile
index 144c5ba10cc..5f10f2aa3b0 100644
--- a/src/test/run-make-fulldeps/print-target-list/Makefile
+++ b/src/test/run-make-fulldeps/print-target-list/Makefile
@@ -2,14 +2,7 @@
 
 # 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 \
-				;; \
-			esac \
+		$(BARE_RUSTC) --target $$target --print sysroot; \
 	done