Skip to content

Commit 97a87ef

Browse files
committed
Rollup merge of rust-lang#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).
2 parents 6d0d608 + 15e5cf3 commit 97a87ef

File tree

1 file changed

+2
-2
lines changed
  • src/test/run-make/codegen-options-parsing

1 file changed

+2
-2
lines changed

Diff for: src/test/run-make/codegen-options-parsing/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ all:
2525

2626
# Should not link dead code...
2727
$(RUSTC) -Z print-link-args dummy.rs 2>&1 | \
28-
grep -e '--gc-sections\|-dead_strip\|/OPT:REF,ICF'
28+
grep -e '--gc-sections' -e '-dead_strip' -e '/OPT:REF,ICF'
2929
# ... unless you specifically ask to keep it
3030
$(RUSTC) -Z print-link-args -C link-dead-code dummy.rs 2>&1 | \
31-
(! grep -e '--gc-sections\|-dead_strip\|/OPT:REF,ICF')
31+
(! grep -e '--gc-sections' -e '-dead_strip' -e '/OPT:REF,ICF')

0 commit comments

Comments
 (0)