diff options
| author | Danek Duvall <danek.duvall@oracle.com> | 2017-08-03 17:18:19 -0700 |
|---|---|---|
| committer | Danek Duvall <danek.duvall@oracle.com> | 2017-08-03 17:18:19 -0700 |
| commit | 497c5a34da45527f6e8a2d5a325293da6724dafb (patch) | |
| tree | d7d0bf1d0eb443c3f0166108f5dc01e3e30c46c2 | |
| parent | 45b90ef52e65377cf1a1483a0d9dd8637de81de3 (diff) | |
| download | rust-497c5a34da45527f6e8a2d5a325293da6724dafb.tar.gz rust-497c5a34da45527f6e8a2d5a325293da6724dafb.zip | |
Solaris linker options need to be accounted for in one test.
This is a follow-up to f189d7a6937 and 9d11b089ad1. While `-z ignore` is what needs to be passed to the Solaris linker, because gcc is used as the default linker, both that form and `-Wl,-z -Wl,ignore` (including extra double quotes) need to be taken into account, which explains the more complex regular expression.
| -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 2b8b0712cc7..dc46a8a04ef 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' -e '-dead_strip' -e '/OPT:REF' + grep -e '--gc-sections' -e '-z[^ ]* [^ ]*\<ignore\>' -e '-dead_strip' -e '/OPT:REF' # ... unless you specifically ask to keep it $(RUSTC) -Z print-link-args -C link-dead-code dummy.rs 2>&1 | \ - (! grep -e '--gc-sections' -e '-dead_strip' -e '/OPT:REF') + (! grep -e '--gc-sections' -e '-z[^ ]* [^ ]*\<ignore\>' -e '-dead_strip' -e '/OPT:REF') |