summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPawel Tomulik <ptomulik@meil.pw.edu.pl>2015-09-19 00:09:53 (GMT)
committerPawel Tomulik <ptomulik@meil.pw.edu.pl>2015-09-19 00:09:53 (GMT)
commit3173faf4aa18308832c7c8a983e3ff556d2cb5ba (patch)
tree3755d2c8db080e46fe0a653fe95ae888d8706e94 /src
parent4f3e3c23da4fe1b1cc22ac1c1030c94f26217ec5 (diff)
downloadSCons-3173faf4aa18308832c7c8a983e3ff556d2cb5ba.zip
SCons-3173faf4aa18308832c7c8a983e3ff556d2cb5ba.tar.gz
SCons-3173faf4aa18308832c7c8a983e3ff556d2cb5ba.tar.bz2
support free-form SHLIBVERSION/LDMODULEVERSION
Diffstat (limited to 'src')
-rw-r--r--src/engine/SCons/Tool/gnulink.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/gnulink.py b/src/engine/SCons/Tool/gnulink.py
index e5e8818..0c5087b 100644
--- a/src/engine/SCons/Tool/gnulink.py
+++ b/src/engine/SCons/Tool/gnulink.py
@@ -103,7 +103,11 @@ def _versioned_lib_symlinks(env, libnode, version, prefix, suffix, name_func, so
link0 = env.fs.File(soname, linkdir)
link1 = env.fs.File(name, linkdir)
- symlinks = [ (link0, libnode), (link1, link0) ]
+ # This allows anything in SHLIBVERSION (especially SHLIBVERSION=1).
+ if link0 == libnode:
+ symlinks = [ (link1, libnode) ]
+ else:
+ symlinks = [ (link0, libnode), (link1, link0) ]
if Verbose:
print "_versioned_lib_symlinks: return symlinks=%r" % SCons.Tool.StringizeLibSymlinks(symlinks)