From f6f919842bf5dc265422309b98546e182e3ee9ae Mon Sep 17 00:00:00 2001 From: Pawel Tomulik Date: Sat, 19 Sep 2015 21:24:29 +0200 Subject: gnulink: create direct symlinks instead of daisy-chained ones --- src/engine/SCons/Tool/gnulink.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/engine/SCons/Tool/gnulink.py b/src/engine/SCons/Tool/gnulink.py index 0c5087b..aabc2f1 100644 --- a/src/engine/SCons/Tool/gnulink.py +++ b/src/engine/SCons/Tool/gnulink.py @@ -103,11 +103,13 @@ def _versioned_lib_symlinks(env, libnode, version, prefix, suffix, name_func, so link0 = env.fs.File(soname, linkdir) link1 = env.fs.File(name, linkdir) - # This allows anything in SHLIBVERSION (especially SHLIBVERSION=1). + # We create direct symlinks, not daisy-chained. if link0 == libnode: + # This enables SHLIBVERSION without periods (e.g. SHLIBVERSION=1) symlinks = [ (link1, libnode) ] else: - symlinks = [ (link0, libnode), (link1, link0) ] + # This handles usual SHLIBVERSION, i.e. '1.2', '1.2.3', etc. + symlinks = [ (link0, libnode), (link1, libnode) ] if Verbose: print "_versioned_lib_symlinks: return symlinks=%r" % SCons.Tool.StringizeLibSymlinks(symlinks) -- cgit v0.12