New upstream version 1.24.1+dfsg1

[rustc.git] / src / test / run-make / target-specs / Makefile

diff --git a/src/test/run-make/target-specs/Makefile b/src/test/run-make/target-specs/Makefile
index 5ea96daa3ef85c90cc5dfce536f1e9f444cbf166..aff15ce38b4aef08c84c63917384ae48b3ac784f 100644 (file)
--- a/src/test/run-make/target-specs/Makefile
+++ b/src/test/run-make/target-specs/Makefile
@@ -1,9 +1,9 @@
 -include ../tools.mk
 all:
        $(RUSTC) foo.rs --target=my-awesome-platform.json --crate-type=lib --emit=asm
-       grep -q -v morestack < $(TMPDIR)/foo.s
-       $(RUSTC) foo.rs --target=my-invalid-platform.json 2>&1 | grep -q "Error loading target specification"
-       $(RUSTC) foo.rs --target=my-incomplete-platform.json 2>&1 | grep 'Field llvm-target'
+       $(CGREP) -v morestack < $(TMPDIR)/foo.s
+       $(RUSTC) foo.rs --target=my-invalid-platform.json 2>&1 | $(CGREP) "Error loading target specification"
+       $(RUSTC) foo.rs --target=my-incomplete-platform.json 2>&1 | $(CGREP) 'Field llvm-target'
        RUST_TARGET_PATH=. $(RUSTC) foo.rs --target=my-awesome-platform --crate-type=lib --emit=asm
        RUST_TARGET_PATH=. $(RUSTC) foo.rs --target=my-x86_64-unknown-linux-gnu-platform --crate-type=lib --emit=asm
        $(RUSTC) -Z unstable-options --target=my-awesome-platform.json --print target-spec-json > $(TMPDIR)/test-platform.json && $(RUSTC) -Z unstable-options --target=$(TMPDIR)/test-platform.json --print target-spec-json | diff -q $(TMPDIR)/test-platform.json -