diff options
| author | Mats Wichmann <mats@linux.com> | 2020-11-22 07:11:00 -0700 |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2020-11-22 07:11:00 -0700 |
| commit | becb5c6cbc5a370b4778374771777c2b493eaa05 (patch) | |
| tree | c1e1ce9458efbbc6dc5b6130713737828b6a8337 /SCons/Tool/__init__.py | |
| parent | 066f50dfd690995ca4ea98528a08454425c702d4 (diff) | |
| download | scons-git-becb5c6cbc5a370b4778374771777c2b493eaa05.tar.gz | |
Move wix tool into windows tool section
The wix tool has a slightly expensive "exists" function,
so its placement in the tool list as generic means non-Windows
platforms also pay this cost. Moved to the win32 section for
other_plat_tools as it's only available on Windows platforms.
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'SCons/Tool/__init__.py')
| -rw-r--r-- | SCons/Tool/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/SCons/Tool/__init__.py b/SCons/Tool/__init__.py index 0c7afb8ac..87139f178 100644 --- a/SCons/Tool/__init__.py +++ b/SCons/Tool/__init__.py @@ -694,7 +694,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', 'wix'] elif str(platform) == 'os2': "prefer IBM tools on OS/2" linkers = ['ilink', 'gnulink', ] # 'mslink'] @@ -794,7 +794,6 @@ def tool_list(platform, env): # TODO: merge 'install' into 'filesystem' and # make 'filesystem' the default 'filesystem', - 'wix', # 'midl', 'msvs', # Parser generators 'lex', 'yacc', # Foreign function interface |