summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorRussel Winder <russel@winder.org.uk>2017-06-18 16:31:56 (GMT)
committerRussel Winder <russel@winder.org.uk>2017-06-18 16:31:56 (GMT)
commit5729b712bb37571a870f5c3e12a99fddfbf18536 (patch)
tree152e93616f5eff89c66f9ca294c9b9a42fd4c6ac /src/engine
parentf57360b60c20eacb2b39485a3986a79a823a2e67 (diff)
downloadSCons-5729b712bb37571a870f5c3e12a99fddfbf18536.zip
SCons-5729b712bb37571a870f5c3e12a99fddfbf18536.tar.gz
SCons-5729b712bb37571a870f5c3e12a99fddfbf18536.tar.bz2
Correct the rpath prefix for LDC on Darwin.
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/Tool/ldc.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/ldc.py b/src/engine/SCons/Tool/ldc.py
index 7e5d339..dc56ad8 100644
--- a/src/engine/SCons/Tool/ldc.py
+++ b/src/engine/SCons/Tool/ldc.py
@@ -111,7 +111,7 @@ def generate(env):
env['DSHLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared -defaultlib=phobos-ldc')
#### END DEPRECATION 2017-05-21
- env['SHDLINKCOM'] = '$DLINK -of=$TARGET $DSHLINKFLAGS $__DSHLIBVERSIONFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS'
+ env['SHDLINKCOM'] = '$DLINK -of=$TARGET $DSHLINKFLAGS $__DSHLIBVERSIONFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS -L-ldruntime-ldc'
env['DLIBLINKPREFIX'] = '' if env['PLATFORM'] == 'win32' else '-L-l'
env['DLIBLINKSUFFIX'] = '.lib' if env['PLATFORM'] == 'win32' else ''
@@ -132,7 +132,7 @@ def generate(env):
# __RPATH is set to $_RPATH in the platform specification if that
# platform supports it.
- env['DRPATHPREFIX'] = '-L-rpath='
+ env['DRPATHPREFIX'] = '-L-Wl,-rpath,' if env['PLATFORM'] == 'darwin' else '-L-rpath='
env['DRPATHSUFFIX'] = ''
env['_DRPATH'] = '${_concat(DRPATHPREFIX, RPATH, DRPATHSUFFIX, __env__)}'