diff options
| author | Russel Winder <russel@winder.org.uk> | 2017-05-01 18:26:10 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2017-05-01 18:26:10 (GMT) |
| commit | b86d2a13733ec960cf974b2e3afbab09e7296ba3 (patch) | |
| tree | a86c0d14e03f006db9f47dcb5a9fc071d4f0cd8b /src/engine/SCons/Tool/ldc.py | |
| parent | fa879a1ea3230176d3bfa64212883dd29d6358b3 (diff) | |
| download | SCons-b86d2a13733ec960cf974b2e3afbab09e7296ba3.zip SCons-b86d2a13733ec960cf974b2e3afbab09e7296ba3.tar.gz SCons-b86d2a13733ec960cf974b2e3afbab09e7296ba3.tar.bz2 | |
Change the imports to help with development and testing. Remove an exception that is no longer needed.
Diffstat (limited to 'src/engine/SCons/Tool/ldc.py')
| -rw-r--r-- | src/engine/SCons/Tool/ldc.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/engine/SCons/Tool/ldc.py b/src/engine/SCons/Tool/ldc.py index d0585af..abd0dd3 100644 --- a/src/engine/SCons/Tool/ldc.py +++ b/src/engine/SCons/Tool/ldc.py @@ -3,7 +3,7 @@ from __future__ import print_function """SCons.Tool.ldc Tool-specific initialization for the LDC compiler. -(http://www.dsource.org/projects/ldc) +(https://github.com/ldc-developers/ldc) Developed by Russel Winder (russel@winder.org.uk) 2012-05-09 onwards @@ -59,7 +59,7 @@ import SCons.Defaults import SCons.Scanner.D import SCons.Tool -import SCons.Tool.DCommon +import SCons.Tool.DCommon as DCommon def generate(env): @@ -86,7 +86,7 @@ def generate(env): env['DDEBUG'] = [] if env['DC']: - SCons.Tool.DCommon.addDPATHToEnv(env, env['DC']) + DCommon.addDPATHToEnv(env, env['DC']) env['DINCPREFIX'] = '-I=' env['DINCSUFFIX'] = '' @@ -104,9 +104,6 @@ def generate(env): env['DSHLINK'] = '$DC' env['DSHLINKFLAGS'] = SCons.Util.CLVar('$DLINKFLAGS -shared -defaultlib=phobos2-ldc') - # 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') env['SHDLINKCOM'] = '$DLINK -of=$TARGET $DSHLINKFLAGS $__DSHLIBVERSIONFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS' env['DLIBLINKPREFIX'] = '' if env['PLATFORM'] == 'win32' else '-L-l' @@ -147,7 +144,7 @@ def generate(env): env['BUILDERS']['ProgramAllAtOnce'] = SCons.Builder.Builder( action='$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS -of=$TARGET $DLINKFLAGS $__DRPATH $SOURCES $_DLIBDIRFLAGS $_DLIBFLAGS', - emitter=SCons.Tool.DCommon.allAtOnceEmitter, + emitter=DCommon.allAtOnceEmitter, ) |