summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussel Winder <russel@winder.org.uk>2014-08-09 18:52:08 +0100
committerRussel Winder <russel@winder.org.uk>2014-08-09 18:52:08 +0100
commit032c4d44d99c4ea306f2541cafa9150e57024c21 (patch)
treeb3e41f90d2a0a9f051af0cd8641c54283c85efa6
parentcb8f0c951de062e5fd3251246ceacdc3d259de89 (diff)
downloadscons-git-032c4d44d99c4ea306f2541cafa9150e57024c21.tar.gz
Remove setting of STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME from the D tools.
-rw-r--r--src/engine/SCons/Tool/dmd.py2
-rw-r--r--src/engine/SCons/Tool/dmd.xml1
-rw-r--r--src/engine/SCons/Tool/gdc.py2
-rw-r--r--src/engine/SCons/Tool/gdc.xml1
-rw-r--r--src/engine/SCons/Tool/ldc.py2
-rw-r--r--src/engine/SCons/Tool/ldc.xml1
6 files changed, 0 insertions, 9 deletions
diff --git a/src/engine/SCons/Tool/dmd.py b/src/engine/SCons/Tool/dmd.py
index f1afc7930..437720ffc 100644
--- a/src/engine/SCons/Tool/dmd.py
+++ b/src/engine/SCons/Tool/dmd.py
@@ -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'])
diff --git a/src/engine/SCons/Tool/dmd.xml b/src/engine/SCons/Tool/dmd.xml
index 65ef75c48..f8936c12f 100644
--- a/src/engine/SCons/Tool/dmd.xml
+++ b/src/engine/SCons/Tool/dmd.xml
@@ -42,7 +42,6 @@ Sets construction variables for D language compiler DMD.
<item>DFLAGS</item>
<item>DVERSIONS</item>
<item>DDEBUG</item>
-<item>STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME</item>
<item>DINCPREFIX</item>
<item>DINCSUFFIX</item>
<item>DVERPREFIX</item>
diff --git a/src/engine/SCons/Tool/gdc.py b/src/engine/SCons/Tool/gdc.py
index 7c8649be5..fb8fea86a 100644
--- a/src/engine/SCons/Tool/gdc.py
+++ b/src/engine/SCons/Tool/gdc.py
@@ -78,8 +78,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'])
diff --git a/src/engine/SCons/Tool/gdc.xml b/src/engine/SCons/Tool/gdc.xml
index 99b060371..20544b003 100644
--- a/src/engine/SCons/Tool/gdc.xml
+++ b/src/engine/SCons/Tool/gdc.xml
@@ -42,7 +42,6 @@ Sets construction variables for the D language compiler GDC.
<item>DFLAGS</item>
<item>DVERSIONS</item>
<item>DDEBUG</item>
-<item>STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME</item>
<item>DINCPREFIX</item>
<item>DINCSUFFIX</item>
<item>DVERPREFIX</item>
diff --git a/src/engine/SCons/Tool/ldc.py b/src/engine/SCons/Tool/ldc.py
index ca873b507..13844e855 100644
--- a/src/engine/SCons/Tool/ldc.py
+++ b/src/engine/SCons/Tool/ldc.py
@@ -83,8 +83,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'])
diff --git a/src/engine/SCons/Tool/ldc.xml b/src/engine/SCons/Tool/ldc.xml
index 18f676dce..f07144bda 100644
--- a/src/engine/SCons/Tool/ldc.xml
+++ b/src/engine/SCons/Tool/ldc.xml
@@ -42,7 +42,6 @@ Sets construction variables for the D language compiler LDC2.
<item>DFLAGS</item>
<item>DVERSIONS</item>
<item>DDEBUG</item>
-<item>STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME</item>
<item>DINCPREFIX</item>
<item>DINCSUFFIX</item>
<item>DVERPREFIX</item>