From f310613fbd25f0103395c46b8f21b35aabbb409a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Fri, 16 Jun 2000 19:46:29 +0200
Subject: [PATCH] Improved support for UnixWare.
Rev: bin/smartlink:1.27
Rev: src/smartlink.c:1.8
---
bin/smartlink | 2 +-
src/smartlink.c | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/bin/smartlink b/bin/smartlink
index b877a076bd..7192e62221 100755
--- a/bin/smartlink
+++ b/bin/smartlink
@@ -153,7 +153,7 @@ if test x$# != x0 ; then
;;
UnixWare\ 7.*)
if test x$LINKING != xno -a "x$RPATH" != x ; then
- LDOPTS="$LDOPTS -YP, $RPATH"
+ LDOPTS="$LDOPTS -Xlinker -YP, -Xlinker $RPATH"
fi
;;
*)
diff --git a/src/smartlink.c b/src/smartlink.c
index 9535631eb1..f6385a0ad1 100644
--- a/src/smartlink.c
+++ b/src/smartlink.c
@@ -1,5 +1,5 @@
/*
- * $Id: smartlink.c,v 1.7 2000/06/16 17:36:25 grubba Exp $
+ * $Id: smartlink.c,v 1.8 2000/06/16 17:45:14 grubba Exp $
*
* smartlink - A smarter linker.
* Based on the /bin/sh script smartlink 1.23.
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
if (!strcmp(argv[1], "-v")) {
fprintf(stdout,
- "$Id: smartlink.c,v 1.7 2000/06/16 17:36:25 grubba Exp $\n"
+ "$Id: smartlink.c,v 1.8 2000/06/16 17:45:14 grubba Exp $\n"
"Usage:\n"
"\t%s binary [args]\n",
argv[0]);
@@ -259,9 +259,11 @@ int main(int argc, char **argv)
#ifdef USE_RPATH
new_argv[new_argc++] = "-rpath";
new_argv[new_argc++] = rpath;
-#elif defined(USE_YP_)
+#elif defined(USE_XLINKER_YP_)
if (linking) {
+ new_argv[new_argc++] = "-Xlinker";
new_argv[new_argc++] = "-YP,";
+ new_argv[new_argc++] = "-Xlinker";
new_argv[new_argc++] = rpath;
}
#elif defined(USE_Wl)
--
GitLab