diff options
| author |   miod <miod@openbsd.org> | 2012-08-11 17:41:56 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2012-08-11 17:41:56 +0000 |
| commit | 663498c4b6daee3653e1b0cbeb66a283c238ddb9 (patch) | |
| tree | 9b577d2d036e8f28856d7fc5e8fb272cd81337eb | |
| parent | Fix state tracking for the error ccb, and pay attention when the READ_LOG_EXT (diff) | |
| download | wireguard-openbsd-663498c4b6daee3653e1b0cbeb66a283c238ddb9.tar.xz wireguard-openbsd-663498c4b6daee3653e1b0cbeb66a283c238ddb9.zip | |
Actually correctly handle -rpath-link, instead of eating its argument but
handling it as -r. Oops.
| -rw-r--r-- | gnu/usr.bin/ld/ld.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/usr.bin/ld/ld.c b/gnu/usr.bin/ld/ld.c index c2f0cfe3f7d..915fb4454dc 100644 --- a/gnu/usr.bin/ld/ld.c +++ b/gnu/usr.bin/ld/ld.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ld.c,v 1.34 2012/08/09 18:19:45 miod Exp $ */ +/* $OpenBSD: ld.c,v 1.35 2012/08/11 17:41:56 miod Exp $ */ /* $NetBSD: ld.c,v 1.52 1998/02/20 03:12:51 jonathan Exp $ */ /*- @@ -692,7 +692,8 @@ decode_option(char *swt, char *arg) warnx("-soname %s ignored", arg); return; } - if (strcmp(swt + 1, "rpath") == 0) { + if (strcmp(swt + 1, "rpath") == 0 || + strcmp(swt + 1, "rpath-link") == 0) { if (warn_forwards_compatible_inexact) warnx("%s %s ignored", swt, arg); goto do_rpath; |