summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Tool/__init__.py
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2013-09-29 23:18:21 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2013-09-29 23:18:21 (GMT)
commitebf829d7db453f10f8edc7a202febcca4f096adf (patch)
treefb939f3ca9fabb93a2e3f78b3bf2b8fe39c5f6c4 /src/engine/SCons/Tool/__init__.py
parent3ba5d044a4a6bb275cc33b42bff7be165d16ad19 (diff)
parentc5e4dcd21f66eb61f3a0699fc733991b3d16dfc0 (diff)
downloadSCons-ebf829d7db453f10f8edc7a202febcca4f096adf.zip
SCons-ebf829d7db453f10f8edc7a202febcca4f096adf.tar.gz
SCons-ebf829d7db453f10f8edc7a202febcca4f096adf.tar.bz2
Merged pull request #86
Diffstat (limited to 'src/engine/SCons/Tool/__init__.py')
-rw-r--r--src/engine/SCons/Tool/__init__.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index 00413e5..7477f75 100644
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -364,7 +364,9 @@ symlinks for the platform we are on"""
print "VerShLib: made sym link of %s -> %s" % (linkname, lib_ver)
return result
-ShLibAction = SCons.Action.Action(VersionedSharedLibrary, None)
+# Fix http://scons.tigris.org/issues/show_bug.cgi?id=2903 :
+# varlist=['$SHLINKCOM']: ensure we still depend on SCons.Defaults.ShLinkAction command line which is $SHLINKCOM
+ShLibAction = SCons.Action.Action(VersionedSharedLibrary, None, varlist=['SHLINKCOM'])
def createSharedLibBuilder(env):
"""This is a utility function that creates the SharedLibrary