diff options
| author | Russel Winder <russel@winder.org.uk> | 2014-09-05 17:46:26 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2014-09-05 17:46:26 (GMT) |
| commit | 074a3c0d96b7a02284b3c67d837d3753731e68c8 (patch) | |
| tree | d28cb71b241205bdb29930ca534a4ea9001ec626 /src | |
| parent | 6d0ecf897b6e2ac2429d0e5ced2f8fe9cf29cdc5 (diff) | |
| download | SCons-074a3c0d96b7a02284b3c67d837d3753731e68c8.zip SCons-074a3c0d96b7a02284b3c67d837d3753731e68c8.tar.gz SCons-074a3c0d96b7a02284b3c67d837d3753731e68c8.tar.bz2 | |
Remove the setting of the ENV property to os.environ.
Diffstat (limited to 'src')
| -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 6b215e2..6b080e6 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' |