summaryrefslogtreecommitdiff
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2012-08-11 17:41:57 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2012-08-11 17:41:57 +0000
commit172bb04215692bef2f4745b69e287ae5ef52e0e7 (patch)
treea675477b27b213f5b3e76c8e77df1f9a9ef1e6c9 /gnu/usr.bin
parent2e49cf9ee092305431f3a467f58d33a0ed2878dd (diff)
Actually correctly handle -rpath-link, instead of eating its argument but
handling it as -r. Oops.
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/ld/ld.c5
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;