FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix typos in compiler_* tools. 

Commit ca60d62bed contaied some errors resulting from copy-pasting
code around, which caused problems with D and Fortran compiler tools.
This commit is contained in:
Krzysztof Kosiński 2014-01-27 16:20:01 +01:00
parent 48a82dacbf
commit c9fe554af4
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
waflib/Tools/compiler_c.py
View File

@ -88,7 +88,7 @@ def options(opt):
opt.load_special_tools('c_*.py', ban=['c_dumbpreproc.py'])
global c_compiler
build_platform = Utils.unversioned_sys_platform()
possible_compiler_list = c_compiler[build_platform in c_compiler and build_platform or 'default']
possible_compiler_list = c_compiler.get(build_platform, c_compiler['default'])
test_for_compiler = ' '.join(possible_compiler_list)
cc_compiler_opts = opt.add_option_group('Configuration options')
cc_compiler_opts.add_option('--check-c-compiler', default=test_for_compiler,

2
waflib/Tools/compiler_cxx.py
View File

@ -90,7 +90,7 @@ def options(opt):
opt.load_special_tools('cxx_*.py')
global cxx_compiler
build_platform = Utils.unversioned_sys_platform()
possible_compiler_list = cxx_compiler[build_platform in cxx_compiler and build_platform or 'default']
possible_compiler_list = cxx_compiler.get(build_platform, cxx_compiler['default'])
test_for_compiler = ' '.join(possible_compiler_list)
cxx_compiler_opts = opt.add_option_group('Configuration options')
cxx_compiler_opts.add_option('--check-cxx-compiler', default=test_for_compiler,

2
waflib/Tools/compiler_d.py
View File

@ -62,7 +62,7 @@ def options(opt):
$ waf configure --check-d-compiler=dmd
"""
build_platform = Utils.unversioned_sys_platform()
possible_compiler_list = d_compiler[build_platform in cxx_compiler and build_platform or 'default']
possible_compiler_list = d_compiler.get(build_platform, d_compiler['default'])
test_for_compiler = ' '.join(possible_compiler_list)
d_compiler_opts = opt.add_option_group('Configuration options')
d_compiler_opts.add_option('--check-d-compiler', default=test_for_compiler, action='store',

10
waflib/Tools/compiler_fc.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python
# encoding: utf-8
import os, sys, imp, types
import os, sys, imp, types, re
from waflib import Utils, Configure, Options, Logs, Errors
from waflib.Tools import fc
@ -20,12 +20,6 @@ Dict mapping the platform names to lists of names of Fortran compilers to try, i
c_compiler['linux'] = ['gfortran', 'g95', 'ifort']
"""
def __list_possible_compiler(platform):
try:
return fc_compiler[platform]
except KeyError:
return fc_compiler["default"]
def configure(conf):
"""
Try to find a suitable Fortran compiler or raise a :py:class:`waflib.Errors.ConfigurationError`.
@ -58,7 +52,7 @@ def options(opt):
"""
opt.load_special_tools('fc_*.py')
build_platform = Utils.unversioned_sys_platform()
possible_compiler_list = fc_compiler[build_platform in cxx_compiler and build_platform or 'default']
possible_compiler_list = fc_compiler.get(build_platform, fc_compiler['default'])
test_for_compiler = ' '.join(possible_compiler_list)
fortran_compiler_opts = opt.add_option_group('Configuration options')
fortran_compiler_opts.add_option('--check-fortran-compiler',