Skip to content

Commit

Permalink
Rollup merge of #61250 - rye:print-target-list--rm-ios-case, r=alexcr…
Browse files Browse the repository at this point in the history
…ichton

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](#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.
  • Loading branch information
Centril committed May 28, 2019
2 parents 16ef483 + e0f017d commit e06547f
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions src/test/run-make-fulldeps/print-target-list/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit e06547f

Please sign in to comment.