From 16bc58049adac72cb1f398d9f89e42757bb4a22f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Aug 2014 15:33:07 +0200 Subject: Imported Upstream version 2.3.3 --- src/engine/SCons/Tool/dmd.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/engine/SCons/Tool/dmd.py') diff --git a/src/engine/SCons/Tool/dmd.py b/src/engine/SCons/Tool/dmd.py index aae9a27..1536bd5 100644 --- a/src/engine/SCons/Tool/dmd.py +++ b/src/engine/SCons/Tool/dmd.py @@ -58,7 +58,7 @@ Lib tool variables: # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/dmd.py 2014/07/05 09:42:21 garyo" +__revision__ = "src/engine/SCons/Tool/dmd.py 2014/08/24 12:12:31 garyo" import os import subprocess @@ -95,8 +95,6 @@ def generate(env): env['DVERSIONS'] = [] env['DDEBUG'] = [] - env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 0 - if env['DC']: SCons.Tool.DCommon.addDPATHToEnv(env, env['DC']) @@ -128,7 +126,7 @@ def generate(env): env['DLIB'] = 'lib' if env['PLATFORM'] == 'win32' else 'ar cr' - env['DLIBCOM'] = '$DLIB $_DLIBFLAGS {} $TARGET $SOURCES $_DLIBFLAGS'.format('-c' if env['PLATFORM'] == 'win32' else '') + env['DLIBCOM'] = '$DLIB $_DLIBFLAGS {0}$TARGET $SOURCES $_DLIBFLAGS'.format('-c ' if env['PLATFORM'] == 'win32' else '') #env['_DLIBFLAGS'] = '$( ${_concat(DLIBFLAGPREFIX, DLIBFLAGS, DLIBFLAGSUFFIX, __env__)} $)' -- cgit v1.2.3