diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2011-09-10 10:58:07 +0200 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2011-09-10 10:58:07 +0200 |
| commit | 7d0cf46e8ad5acb1028a391255a9b84d2f6d3cdf (patch) | |
| tree | bcf7a54e7f8ad198e6d31adf0fffc0e0c74469e4 /engine/SCons/Tool/gnulink.py | |
| parent | de2237c3cf3dd7dcc0a914f78348fdb6d821c296 (diff) | |
| parent | 9dc7be6c34e2bda6d0d96a450bb8eee03b277ba3 (diff) | |
Merge commit 'upstream/2.1.0'
Diffstat (limited to 'engine/SCons/Tool/gnulink.py')
| -rw-r--r-- | engine/SCons/Tool/gnulink.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engine/SCons/Tool/gnulink.py b/engine/SCons/Tool/gnulink.py index 1204535..a80611e 100644 --- a/engine/SCons/Tool/gnulink.py +++ b/engine/SCons/Tool/gnulink.py @@ -9,7 +9,7 @@ selection method. """ # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation +# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/gnulink.py 5134 2010/08/16 23:02:40 bdeegan" +__revision__ = "src/engine/SCons/Tool/gnulink.py 5357 2011/09/09 21:31:03 bdeegan" import SCons.Util @@ -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'] = '-Wl,-rpath=' env['RPATHSUFFIX'] = '' env['_RPATH'] = '${_concat(RPATHPREFIX, RPATH, RPATHSUFFIX, __env__)}' |