From 032c4d44d99c4ea306f2541cafa9150e57024c21 Mon Sep 17 00:00:00 2001
From: Russel Winder <russel@winder.org.uk>
Date: Sat, 9 Aug 2014 18:52:08 +0100
Subject: Remove setting of STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME from the D
 tools.

---
 src/engine/SCons/Tool/dmd.py  | 2 --
 src/engine/SCons/Tool/dmd.xml | 1 -
 src/engine/SCons/Tool/gdc.py  | 2 --
 src/engine/SCons/Tool/gdc.xml | 1 -
 src/engine/SCons/Tool/ldc.py  | 2 --
 src/engine/SCons/Tool/ldc.xml | 1 -
 6 files changed, 9 deletions(-)

diff --git a/src/engine/SCons/Tool/dmd.py b/src/engine/SCons/Tool/dmd.py
index f1afc79..437720f 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 65ef75c..f8936c1 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 7c8649b..fb8fea8 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 99b0603..20544b0 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 ca873b5..13844e8 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 18f676d..f07144b 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>
-- 
cgit v0.12