diff options
author | Russel Winder <russel@winder.org.uk> | 2017-06-20 19:52:04 +0100 |
---|---|---|
committer | Russel Winder <russel@winder.org.uk> | 2017-06-20 19:52:04 +0100 |
commit | f85f2651e627457d99b88d6b93aaf44b65a5b7c7 (patch) | |
tree | c6a5a76aef0ad21137747d8d97ebd1ab4115ef30 | |
parent | 4eb7283d54401b6b7a1bb6e8e762a2005781ea68 (diff) | |
download | scons-f85f2651e627457d99b88d6b93aaf44b65a5b7c7.tar.gz |
Update the DC setting as requested to use Detect.
-rw-r--r-- | src/engine/SCons/Tool/gdc.py | 2 | ||||
-rw-r--r-- | src/engine/SCons/Tool/ldc.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/gdc.py b/src/engine/SCons/Tool/gdc.py index 4baa548c..a8e037ca 100644 --- a/src/engine/SCons/Tool/gdc.py +++ b/src/engine/SCons/Tool/gdc.py @@ -65,7 +65,7 @@ def generate(env): static_obj.add_emitter('.d', SCons.Defaults.StaticObjectEmitter) shared_obj.add_emitter('.d', SCons.Defaults.SharedObjectEmitter) - env['DC'] = 'gdc' + env['DC'] = env.Detect('gdc') or 'gdc' env['DCOM'] = '$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS -c -o $TARGET $SOURCES' env['_DINCFLAGS'] = '${_concat(DINCPREFIX, DPATH, DINCSUFFIX, __env__, RDirs, TARGET, SOURCE)}' env['_DVERFLAGS'] = '${_concat(DVERPREFIX, DVERSIONS, DVERSUFFIX, __env__)}' diff --git a/src/engine/SCons/Tool/ldc.py b/src/engine/SCons/Tool/ldc.py index 1c4f5665..b10bb75a 100644 --- a/src/engine/SCons/Tool/ldc.py +++ b/src/engine/SCons/Tool/ldc.py @@ -70,7 +70,7 @@ def generate(env): static_obj.add_emitter('.d', SCons.Defaults.StaticObjectEmitter) shared_obj.add_emitter('.d', SCons.Defaults.SharedObjectEmitter) - env['DC'] = 'ldc2' + env['DC'] = env.Detect('ldc2') or 'ldc2' env['DCOM'] = '$DC $_DINCFLAGS $_DVERFLAGS $_DDEBUGFLAGS $_DFLAGS -c -of=$TARGET $SOURCES' env['_DINCFLAGS'] = '${_concat(DINCPREFIX, DPATH, DINCSUFFIX, __env__, RDirs, TARGET, SOURCE)}' env['_DVERFLAGS'] = '${_concat(DVERPREFIX, DVERSIONS, DVERSUFFIX, __env__)}' |