From 74207e0e31f375b33c313194ae64bcde459994f4 Mon Sep 17 00:00:00 2001
From: Russel Winder <russel@winder.org.uk>
Date: Mon, 12 Jun 2017 18:44:21 +0100
Subject: Remove the static lib builder creation in the D tools.

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

diff --git a/src/engine/SCons/Tool/dmd.py b/src/engine/SCons/Tool/dmd.py
index 64beea5..1becc14 100644
--- a/src/engine/SCons/Tool/dmd.py
+++ b/src/engine/SCons/Tool/dmd.py
@@ -144,8 +144,6 @@ def generate(env):
     env['DSHLIBVERSION'] = '$SHLIBVERSION'
     env['DSHLIBVERSIONFLAGS'] = []
 
-    SCons.Tool.createStaticLibBuilder(env)
-
     env['BUILDERS']['ProgramAllAtOnce'] = SCons.Builder.Builder(
         action='$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS -of$TARGET $DLINKFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS',
         emitter=DCommon.allAtOnceEmitter,
diff --git a/src/engine/SCons/Tool/gdc.py b/src/engine/SCons/Tool/gdc.py
index fdfe867..fc844aa 100644
--- a/src/engine/SCons/Tool/gdc.py
+++ b/src/engine/SCons/Tool/gdc.py
@@ -128,8 +128,6 @@ def generate(env):
     env['DSHLIBVERSION'] = '$SHLIBVERSION'
     env['DSHLIBVERSIONFLAGS'] = '$SHLIBVERSIONFLAGS'
 
-    SCons.Tool.createStaticLibBuilder(env)
-
     env['BUILDERS']['ProgramAllAtOnce'] = SCons.Builder.Builder(
         action='$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS -o $TARGET $DLINKFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS',
         emitter=DCommon.allAtOnceEmitter,
diff --git a/src/engine/SCons/Tool/ldc.py b/src/engine/SCons/Tool/ldc.py
index 215c3e7..dfa2d70 100644
--- a/src/engine/SCons/Tool/ldc.py
+++ b/src/engine/SCons/Tool/ldc.py
@@ -147,8 +147,6 @@ def generate(env):
     env['DSHLIBVERSION'] = '$SHLIBVERSION'
     env['DSHLIBVERSIONFLAGS'] = []
 
-    SCons.Tool.createStaticLibBuilder(env)
-
     env['BUILDERS']['ProgramAllAtOnce'] = SCons.Builder.Builder(
         action='$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS -of=$TARGET $DLINKFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS',
         emitter=DCommon.allAtOnceEmitter,
-- 
cgit v0.12


From cb59885a49857539795080884b037ca602cf5b87 Mon Sep 17 00:00:00 2001
From: Russel Winder <russel@winder.org.uk>
Date: Mon, 19 Jun 2017 18:01:23 +0100
Subject: Remove deprecated exception to the shared object naming of Phobos on
 Fedora.

---
 src/engine/SCons/Tool/ldc.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/engine/SCons/Tool/ldc.py b/src/engine/SCons/Tool/ldc.py
index dfa2d70..8b551fc 100644
--- a/src/engine/SCons/Tool/ldc.py
+++ b/src/engine/SCons/Tool/ldc.py
@@ -105,12 +105,6 @@ def generate(env):
     env['DSHLINK'] = '$DC'
     env['DSHLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared -defaultlib=phobos2-ldc')
 
-    #### START DEPRECATION 2017-05-21
-    # Hack for Fedora the packages of which use the wrong name :-(
-    if os.path.exists('/usr/lib64/libphobos-ldc.so') or os.path.exists('/usr/lib32/libphobos-ldc.so') or os.path.exists('/usr/lib/libphobos-ldc.so'):
-        env['DSHLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared -defaultlib=phobos-ldc')
-    #### END DEPRECATION 2017-05-21
-
     env['SHDLINKCOM'] = '$DLINK -of=$TARGET $DSHLINKFLAGS $__DSHLIBVERSIONFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS'
 
     env['DLIBLINKPREFIX'] = '' if env['PLATFORM'] == 'win32' else '-L-l'
-- 
cgit v0.12


From 2c22c3ec5160b3d8e9ccb8884dfef96035b0f82e Mon Sep 17 00:00:00 2001
From: Russel Winder <russel@winder.org.uk>
Date: Mon, 19 Jun 2017 18:50:34 +0100
Subject: Update src/CHANGES.txt.

---
 src/CHANGES.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 5d670fd..537aca3 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -73,8 +73,11 @@ RELEASE 3.0.0.alpha.20170614 - Mon, 14 Jun 2017 12:23:56 -0400
   From Russel Winder:
     - Reordered the default D tools from "dmd, gdc, ldc" to "dmd, ldc, gdc".
     - Add a ProgramAllAtOnce builder to the dmd, ldc, and gdc tools. (PR #448)
-    - Deprecate a file name exception for very old Fedora LDC installation.
+    - Remove a file name exception for very old Fedora LDC installation.
     - gdc can now handle building shared objects (tested for version 6.3.0).
+    - Remove establishing the SharedLibrary builder in the dmd, ldc, and gdc
+      tools, must now include the ar tool to get this builder as is required for
+      other compiler tools.
 
 RELEASE 2.5.1 - Mon, 03 Nov 2016 13:37:42 -0400
 
-- 
cgit v0.12