diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2011-03-03 03:00:19 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2011-03-03 03:00:19 (GMT) |
| commit | c977df07cbc24b5359087072ee6ac97b01469be3 (patch) | |
| tree | 540325d278d8609da704ab44e8cf777b93c642ee /src/engine/SCons/Tool/sgilink.py | |
| parent | 8e57d53b7feaa432d604a1bb18f464e048c84cef (diff) | |
| download | SCons-c977df07cbc24b5359087072ee6ac97b01469be3.zip SCons-c977df07cbc24b5359087072ee6ac97b01469be3.tar.gz SCons-c977df07cbc24b5359087072ee6ac97b01469be3.tar.bz2 | |
Fix #1644: LINKFLAGS and RPATH conflict. Moved RPATH into LINKCOM.
Diffstat (limited to 'src/engine/SCons/Tool/sgilink.py')
| -rw-r--r-- | src/engine/SCons/Tool/sgilink.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/sgilink.py b/src/engine/SCons/Tool/sgilink.py index 1c32ad0..6244141 100644 --- a/src/engine/SCons/Tool/sgilink.py +++ b/src/engine/SCons/Tool/sgilink.py @@ -48,7 +48,6 @@ def generate(env): # __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__)}' |