diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2016-02-14 03:59:11 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2016-02-14 05:06:36 +0530 |
| commit | 97a87ef509d8202f3b6ed2178e9b14211481c8d1 (patch) | |
| tree | 297395c2933e2baf396fa19c991331217a2fd7fe | |
| parent | 6d0d6088b4d0cceab4c821cba9329f0944461806 (diff) | |
| parent | 15e5cf383ddba4ace0acdb045c55d25bc3432f38 (diff) | |
| download | rust-97a87ef509d8202f3b6ed2178e9b14211481c8d1.tar.gz rust-97a87ef509d8202f3b6ed2178e9b14211481c8d1.zip | |
Rollup merge of #31635 - semarie:grep-e, r=alexcrichton
The BSD grep for "basic regex" don't support \| as alternate operator (at least under OpenBSD). Use multiple -e arguments for expressing alternative. I have checked it under Linux (Debian).
| -rw-r--r-- | src/test/run-make/codegen-options-parsing/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/run-make/codegen-options-parsing/Makefile b/src/test/run-make/codegen-options-parsing/Makefile index c1f9065e9d2..9543fad8e53 100644 --- a/src/test/run-make/codegen-options-parsing/Makefile +++ b/src/test/run-make/codegen-options-parsing/Makefile @@ -25,7 +25,7 @@ all: # Should not link dead code... $(RUSTC) -Z print-link-args dummy.rs 2>&1 | \ - grep -e '--gc-sections\|-dead_strip\|/OPT:REF,ICF' + grep -e '--gc-sections' -e '-dead_strip' -e '/OPT:REF,ICF' # ... unless you specifically ask to keep it $(RUSTC) -Z print-link-args -C link-dead-code dummy.rs 2>&1 | \ - (! grep -e '--gc-sections\|-dead_strip\|/OPT:REF,ICF') + (! grep -e '--gc-sections' -e '-dead_strip' -e '/OPT:REF,ICF') |