diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-29 22:20:34 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-09-29 22:20:34 +0200 |
| commit | 4afc984101977fdff83c8b3ed7c26fcaf1a0030e (patch) | |
| tree | 58016e3c49b02a7d08effd2258dcf80c8af37350 /src/engine/SCons/Tool/ldc.py | |
| parent | a414d8e46960130a36b0bde5de3bef8cbd769e13 (diff) | |
| parent | a2795b63dd02ecddd8a0109dcc1b64108f68eace (diff) | |
Merge tag 'upstream/2.3.4'
Upstream version 2.3.4
Diffstat (limited to 'src/engine/SCons/Tool/ldc.py')
| -rw-r--r-- | src/engine/SCons/Tool/ldc.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/ldc.py b/src/engine/SCons/Tool/ldc.py index e78cf5a..a32c5ab 100644 --- a/src/engine/SCons/Tool/ldc.py +++ b/src/engine/SCons/Tool/ldc.py @@ -46,7 +46,7 @@ Lib tool variables: # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/ldc.py 2014/08/24 12:12:31 garyo" +__revision__ = "src/engine/SCons/Tool/ldc.py 2014/09/27 12:51:43 garyo" import os import subprocess @@ -101,7 +101,7 @@ def generate(env): env['DLINKCOM'] = '$DLINK -of=$TARGET $DLINKFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS' env['DSHLINK'] = '$DC' - env['DSHLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared') + env['DSHLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared -defaultlib=phobos2') env['SHDLINKCOM'] = '$DLINK -of=$TARGET $DSHLINKFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS' env['DLIBLINKPREFIX'] = '' if env['PLATFORM'] == 'win32' else '-L-l' @@ -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) |