diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/sgilink.py | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 083d640..6550064 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -28,7 +28,8 @@ RELEASE 0.96 - XXX From Chad Austin and Christoph Wiedemann: - Add support for a $RPATH variable to supply a list of directories - to search for shared libraries when linking a program. + to search for shared libraries when linking a program. Used by + the GNU and IRIX linkers (gnulink and sgilink). From Charles Crain: diff --git a/src/engine/SCons/Tool/sgilink.py b/src/engine/SCons/Tool/sgilink.py index 80cfcf4..85d9e30 100644 --- a/src/engine/SCons/Tool/sgilink.py +++ b/src/engine/SCons/Tool/sgilink.py @@ -46,5 +46,12 @@ def generate(env): env['LINK'] = env.Detect(linkers) or 'cc' env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared') + # __RPATH is set to $_RPATH in the platform specification if that + # platform supports it. + env.Append(LINKFLAGS=['$__RPATH']) + env['RPATHPREFIX'] = '-rpath ' + env['RPATHSUFFIX'] = '' + env['_RPATH'] = '${_concat(RPATHPREFIX, RPATH, RPATHSUFFIX, __env__)}' + def exists(env): return env.Detect(linkers) |