diff options
| author | Pawel Tomulik <ptomulik@meil.pw.edu.pl> | 2015-09-19 19:24:29 (GMT) |
|---|---|---|
| committer | Pawel Tomulik <ptomulik@meil.pw.edu.pl> | 2015-09-19 19:24:29 (GMT) |
| commit | f6f919842bf5dc265422309b98546e182e3ee9ae (patch) | |
| tree | 0755ea109a4537f5b5302eb159ec6404b553be70 /src | |
| parent | 3173faf4aa18308832c7c8a983e3ff556d2cb5ba (diff) | |
| download | SCons-f6f919842bf5dc265422309b98546e182e3ee9ae.zip SCons-f6f919842bf5dc265422309b98546e182e3ee9ae.tar.gz SCons-f6f919842bf5dc265422309b98546e182e3ee9ae.tar.bz2 | |
gnulink: create direct symlinks instead of daisy-chained ones
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/gnulink.py | 6 |
1 files 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) |