diff options
| author | Dirk Baechle <dl9obn@darc.de> | 2014-09-12 17:59:39 (GMT) |
|---|---|---|
| committer | Dirk Baechle <dl9obn@darc.de> | 2014-09-12 17:59:39 (GMT) |
| commit | 2607d69b86683acd061491826b5bf304f552284d (patch) | |
| tree | a125cf2fc6f5024c9919f4a992b318c1350f0304 /src/engine | |
| parent | 87cb9ca579c9e8cc2d972552f8db6590b991cdeb (diff) | |
| parent | 70a6365e0bcf530819a83edaa3b9d9bbc08b218e (diff) | |
| download | SCons-2607d69b86683acd061491826b5bf304f552284d.zip SCons-2607d69b86683acd061491826b5bf304f552284d.tar.gz SCons-2607d69b86683acd061491826b5bf304f552284d.tar.bz2 | |
Merged in russel/scons (pull request #182), various fixes for the D tools and their tests
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Tool/gdc.py | 6 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/ldc.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/SCons/Tool/gdc.py b/src/engine/SCons/Tool/gdc.py index 1178b85..048d736 100644 --- a/src/engine/SCons/Tool/gdc.py +++ b/src/engine/SCons/Tool/gdc.py @@ -95,9 +95,9 @@ def generate(env): env['DLINKFLAGS'] = SCons.Util.CLVar('') env['DLINKCOM'] = '$DLINK -o $TARGET $DLINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS' - env['SHDLINK'] = '$DC' - env['SHDLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared') - env['SHDLINKCOM'] = '$DLINK -o $TARGET $DLINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS' + env['DSHLINK'] = '$DC' + env['DSHLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared') + env['SHDLINKCOM'] = '$DLINK -o $TARGET $DSHLINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS' env['DLIB'] = 'lib' if env['PLATFORM'] == 'win32' else 'ar cr' env['DLIBCOM'] = '$DLIB $_DLIBFLAGS {0}$TARGET $SOURCES $_DLINKLIBFLAGS'.format('-c ' if env['PLATFORM'] == 'win32' else '') diff --git a/src/engine/SCons/Tool/ldc.py b/src/engine/SCons/Tool/ldc.py index fa50060..d74464f 100644 --- a/src/engine/SCons/Tool/ldc.py +++ b/src/engine/SCons/Tool/ldc.py @@ -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' |