From 4aa854fc47219491b1e78416e5b033843db2f4de Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Fri, 3 Nov 2006 07:28:53 +0000
Subject: The Tru64 linker does not know -h ${soname}, only -soname ${soname}.

Patch provided by Hrvoje Habjanic in http://mail-index.netbsd.org/pkgsrc-users/2006/11/02/0003.html
---
 mk/wrapper/cmd-sink-osf1-cc | 7 ++++++-
 mk/wrapper/cmd-sink-osf1-ld | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'mk')

diff --git a/mk/wrapper/cmd-sink-osf1-cc b/mk/wrapper/cmd-sink-osf1-cc
index b67d1da838e..9e4f8509806 100644
--- a/mk/wrapper/cmd-sink-osf1-cc
+++ b/mk/wrapper/cmd-sink-osf1-cc
@@ -1,4 +1,4 @@
-# $NetBSD: cmd-sink-osf1-cc,v 1.1 2004/11/20 04:37:08 grant Exp $
+# $NetBSD: cmd-sink-osf1-cc,v 1.2 2006/11/03 07:28:53 rillig Exp $
 
 # Empty out the command buffer and build up the command line in $cmd.
 osf1runpath=
@@ -34,6 +34,11 @@ while ! queue_is_empty cmdbuf; do
 		esac
 		$debug_log $wrapperlog "    (cmd-sink-osf1-cc) drop: $dir [adding to osf1runpath]"
 		;;
+	-Wl,-h*)
+		arg="-Wl,-soname"${arg#"-Wl,-h"}
+		$debug_log $wrapperlog "    (cmd-sink-osf1-cc) pop: $arg"
+		. $buildcmd
+		;;
 	*)
 		. $buildcmd
 		;;
diff --git a/mk/wrapper/cmd-sink-osf1-ld b/mk/wrapper/cmd-sink-osf1-ld
index 1dabe3a196f..2ddaf831bb0 100644
--- a/mk/wrapper/cmd-sink-osf1-ld
+++ b/mk/wrapper/cmd-sink-osf1-ld
@@ -1,4 +1,4 @@
-# $NetBSD: cmd-sink-osf1-ld,v 1.1 2004/11/20 04:37:08 grant Exp $
+# $NetBSD: cmd-sink-osf1-ld,v 1.2 2006/11/03 07:28:53 rillig Exp $
 
 # Empty out the command buffer and build up the command line in $cmd.
 osf1runpath=
@@ -33,6 +33,11 @@ while ! queue_is_empty cmdbuf; do
 		esac
 		$debug_log $wrapperlog "    (cmd-sink-osf1-ld) drop: $dir [adding to osf1runpath]"
 		;;
+	-Wl,-h,*)
+		arg="-Wl,-soname"${arg#"-Wl,-h"}
+		$debug_log $wrapperlog "    (cmd-sink-osf1-ld) pop: $arg"
+		. $buildcmd
+		;;
 	-pthread)
 		arg="-lpthread"
 		$debug_log $wrapperlog "    (cmd-sink-osf1-ld) pop: $arg"
-- 
cgit v1.2.3