diff options
| author | Russel Winder <russel@winder.org.uk> | 2017-06-18 17:31:56 +0100 |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2017-06-18 17:31:56 +0100 |
| commit | dcf9bcebe773c6968bf0f897353bc68b3b765e91 (patch) | |
| tree | 152e93616f5eff89c66f9ca294c9b9a42fd4c6ac | |
| parent | f18755e5443d9a1dc1931888e786fc618ec9035d (diff) | |
| download | scons-dcf9bcebe773c6968bf0f897353bc68b3b765e91.tar.gz | |
Correct the rpath prefix for LDC on Darwin.
| -rw-r--r-- | src/engine/SCons/Tool/ldc.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/ldc.py b/src/engine/SCons/Tool/ldc.py index 7e5d3396..dc56ad8b 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__)}' |