diff options
| author | grbd <garlicbready@googlemail.com> | 2017-06-20 18:27:41 (GMT) |
|---|---|---|
| committer | grbd <garlicbready@googlemail.com> | 2017-06-20 18:27:41 (GMT) |
| commit | d81b893dfe30c3d5c61d38e8bedc62888b987d41 (patch) | |
| tree | e543d978cb355faf9898b7477cf39d7f3cee6825 | |
| parent | fab72bed412cb035d96b9d8415f7052540a20556 (diff) | |
| parent | 2c22c3ec5160b3d8e9ccb8884dfef96035b0f82e (diff) | |
| download | SCons-d81b893dfe30c3d5c61d38e8bedc62888b987d41.zip SCons-d81b893dfe30c3d5c61d38e8bedc62888b987d41.tar.gz SCons-d81b893dfe30c3d5c61d38e8bedc62888b987d41.tar.bz2 | |
Merged default into default
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/dmd.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/gdc.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/ldc.py | 8 |
4 files changed, 4 insertions, 13 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index e6d9c02..745c69d 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -77,8 +77,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 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..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' @@ -147,8 +141,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, |