summaryrefslogtreecommitdiff
path: root/engine/SCons/Tool/dmd.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-08-25 15:11:39 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-08-25 15:11:39 +0200
commitb2fa39f7baf24a9da2ee40e6d625e8ce91c4b471 (patch)
treef9eca9049e11ca23426f8cf8b5302f65b547d49d /engine/SCons/Tool/dmd.py
parentdf9075291049202264a88a9740f281a55823ff62 (diff)
parent765fbac29295fb4e462c480d09dbdb2f9718a845 (diff)
Merge tag 'upstream/2.3.3'
Upstream version 2.3.3
Diffstat (limited to 'engine/SCons/Tool/dmd.py')
-rw-r--r--engine/SCons/Tool/dmd.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/engine/SCons/Tool/dmd.py b/engine/SCons/Tool/dmd.py
index aae9a27..1536bd5 100644
--- a/engine/SCons/Tool/dmd.py
+++ b/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__)} $)'