From c19a39d0a8dc8253d1da4830f792233f056cd60a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Sch=C3=B6pflin?= <markus.schoepflin@comsoft.de>
Date: Wed, 24 May 2006 10:40:49 +0000
Subject: [PATCH] Merged fix for soname problem on Tru64 from HEAD to
 RC_1_34_0.

[SVN r34080]
---
 v2/tools/gcc.jam | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/v2/tools/gcc.jam b/v2/tools/gcc.jam
index a0b2b113c..b297af9d4 100644
--- a/v2/tools/gcc.jam
+++ b/v2/tools/gcc.jam
@@ -189,18 +189,13 @@ if [ os.name ] != CYGWIN && [ os.name ] != NT
     # to implement and will increase target path length even more.
     flags gcc.compile OPTIONS <link>shared : -fPIC ;
 }    
-if [ os.name ] != NT
+if [ os.name ] != NT && [ os.name ] != OSF
 {
-    HAVE_SONAME = "" ;
+    # OSF does have an option called -soname but it doesn't seem to work as
+    # expected, therefore it has been disabled.
 
-    if [ os.name ] = OSF
-    {
-        SONAME_OPTION = -soname ;
-    }
-    else
-    {
-        SONAME_OPTION = -h ;
-    }
+    HAVE_SONAME   = "" ;
+    SONAME_OPTION = -h ;
 }