diff options
| author | Russel Winder <russel@winder.org.uk> | 2014-04-16 09:46:39 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2014-04-16 09:46:39 (GMT) |
| commit | da72e009ae9e2f450a601d52f2530338efa6a377 (patch) | |
| tree | df6efa619e83c0cfc7bd932ae3c9c786cf812246 /src/engine/SCons/Tool/__init__.py | |
| parent | d4f8c6e320484c106446918c37affdddacd5c7a3 (diff) | |
| download | SCons-da72e009ae9e2f450a601d52f2530338efa6a377.zip SCons-da72e009ae9e2f450a601d52f2530338efa6a377.tar.gz SCons-da72e009ae9e2f450a601d52f2530338efa6a377.tar.bz2 | |
The changes to the D support evolved over the last many months packaged as a single changeset.
Diffstat (limited to 'src/engine/SCons/Tool/__init__.py')
| -rw-r--r-- | src/engine/SCons/Tool/__init__.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py index c09f8e4..31e3d96 100644 --- a/src/engine/SCons/Tool/__init__.py +++ b/src/engine/SCons/Tool/__init__.py @@ -705,7 +705,7 @@ def tool_list(platform, env): assemblers = ['masm', 'nasm', 'gas', '386asm' ] fortran_compilers = ['gfortran', 'g77', 'ifl', 'cvf', 'f95', 'f90', 'fortran'] ars = ['mslib', 'ar', 'tlib'] - other_plat_tools=['msvs','midl'] + other_plat_tools = ['msvs', 'midl'] elif str(platform) == 'os2': "prefer IBM tools on OS/2" linkers = ['ilink', 'gnulink', ]#'mslink'] @@ -795,8 +795,10 @@ def tool_list(platform, env): fortran_compiler = FindTool(fortran_compilers, env) or fortran_compilers[0] ar = FindTool(ars, env) or ars[0] + d_compilers = ['dmd', 'gdc', 'ldc'] + d_compiler = FindTool(d_compilers, env) or d_compilers[0] + other_tools = FindAllTools(other_plat_tools + [ - 'dmd', #TODO: merge 'install' into 'filesystem' and # make 'filesystem' the default 'filesystem', @@ -819,7 +821,7 @@ def tool_list(platform, env): ], env) tools = ([linker, c_compiler, cxx_compiler, - fortran_compiler, assembler, ar] + fortran_compiler, assembler, ar, d_compiler] + other_tools) return [x for x in tools if x] |