From 9e5928980c0855f91de016467ef752d3aa338f1a Mon Sep 17 00:00:00 2001
From: Pawel Tomulik <ptomulik@meil.pw.edu.pl>
Date: Sun, 20 Sep 2015 13:42:22 +0200
Subject: do not set SHxxxx variables in sunar.py

---
 src/engine/SCons/Tool/sunar.py  | 3 ---
 src/engine/SCons/Tool/sunar.xml | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/src/engine/SCons/Tool/sunar.py b/src/engine/SCons/Tool/sunar.py
index 3ee4344..eb58457 100644
--- a/src/engine/SCons/Tool/sunar.py
+++ b/src/engine/SCons/Tool/sunar.py
@@ -51,9 +51,6 @@ def generate(env):
         env['ARFLAGS']     = SCons.Util.CLVar('r')
         env['ARCOM']       = '$AR $ARFLAGS $TARGET $SOURCES'
 
-    env['SHLINK']      = '$LINK'
-    env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -G')
-    env['SHLINKCOM']   = '$SHLINK -o $TARGET $SHLINKFLAGS $__SHLIBVERSIONFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
     env['LIBPREFIX']   = 'lib'
     env['LIBSUFFIX']   = '.a'
 
diff --git a/src/engine/SCons/Tool/sunar.xml b/src/engine/SCons/Tool/sunar.xml
index 65f0c9e..f875217 100644
--- a/src/engine/SCons/Tool/sunar.xml
+++ b/src/engine/SCons/Tool/sunar.xml
@@ -33,15 +33,11 @@ Sets construction variables for the Sun library archiver.
 <item>AR</item>
 <item>ARFLAGS</item>
 <item>ARCOM</item>
-<item>SHLINK</item>
-<item>SHLINKFLAGS</item>
-<item>SHLINKCOM</item>
 <item>LIBPREFIX</item>
 <item>LIBSUFFIX</item>
 </sets>
 <uses>
 <item>ARCOMSTR</item>
-<item>SHLINKCOMSTR</item>
 </uses>
 </tool>
 
-- 
cgit v0.12