summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons
diff options
context:
space:
mode:
authorRussel Winder <russel@winder.org.uk>2014-09-11 19:42:56 (GMT)
committerRussel Winder <russel@winder.org.uk>2014-09-11 19:42:56 (GMT)
commitb068a00f91abb6e5f4282cdd7d85b20497108d2b (patch)
treea125cf2fc6f5024c9919f4a992b318c1350f0304 /src/engine/SCons
parent70a6365e0bcf530819a83edaa3b9d9bbc08b218e (diff)
parent87cb9ca579c9e8cc2d972552f8db6590b991cdeb (diff)
downloadSCons-b068a00f91abb6e5f4282cdd7d85b20497108d2b.zip
SCons-b068a00f91abb6e5f4282cdd7d85b20497108d2b.tar.gz
SCons-b068a00f91abb6e5f4282cdd7d85b20497108d2b.tar.bz2
Commit merge issues.
Diffstat (limited to 'src/engine/SCons')
-rw-r--r--src/engine/SCons/Tool/ldc.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/ldc.py b/src/engine/SCons/Tool/ldc.py
index 6b080e6..d74464f 100644
--- a/src/engine/SCons/Tool/ldc.py
+++ b/src/engine/SCons/Tool/ldc.py
@@ -126,7 +126,7 @@ def generate(env):
# platform supports it.
env['DRPATHPREFIX'] = '-L-rpath='
env['DRPATHSUFFIX'] = ''
- env['_RPATH'] = '${_concat(DRPATHPREFIX, RPATH, DRPATHSUFFIX, __env__)}'
+ env['_DRPATH'] = '${_concat(DRPATHPREFIX, RPATH, DRPATHSUFFIX, __env__)}'
SCons.Tool.createStaticLibBuilder(env)