diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-05-18 18:30:56 -0400 |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2014-05-18 18:30:56 -0400 |
| commit | 99fd3f7cb590e1f6c7138b519c74620672583913 (patch) | |
| tree | 44f13b96ea035a0d1838ac884b1f65edee7260f0 | |
| parent | b4b6b26743c16f3c27269fc22da22b00a9c71440 (diff) | |
| parent | 43801bc536c1e646603d05949f10281d8ad1258e (diff) | |
| download | scons-99fd3f7cb590e1f6c7138b519c74620672583913.tar.gz | |
Closed branch issue1723
| -rw-r--r-- | src/CHANGES.txt | 8 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/__init__.py | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index d11fd70b..ccc9f7c1 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -6,6 +6,9 @@ RELEASE 2.3.2.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE + From Michael Haubenwallner: + - Respect user's CC/CXX values; don't always overwrite in generate() + From Amir Szekely: - Fixed NoClean() for multi-target builders (#2353). @@ -35,6 +38,11 @@ RELEASE 2.3.2.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE that were failing because of this extra line in the output * error message when SCons import fails now lists lookup paths - Remove support for QMTest harness from runtest.py + - Remove RPM and m4 from default tools on Windows + - BitKeeper, CVS, Perforce, RCS, SCCS are deprecated from default + tools and will be removed in future SCons versions to speed up + SCons initialization (it will still be possible to use these tools + explicitly) From Dirk Baechle: - Update XML doc editor configuration diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py index 31e3d96d..55eb1d31 100644 --- a/src/engine/SCons/Tool/__init__.py +++ b/src/engine/SCons/Tool/__init__.py @@ -772,6 +772,9 @@ def tool_list(platform, env): fortran_compilers = ['gfortran', 'g77', 'ifort', 'ifl', 'f95', 'f90', 'f77'] ars = ['ar', 'mslib'] + if not str(platform) == 'win32': + other_plat_tools += ['m4', 'rpm'] + c_compiler = FindTool(c_compilers, env) or c_compilers[0] # XXX this logic about what tool provides what should somehow be @@ -802,7 +805,6 @@ def tool_list(platform, env): #TODO: merge 'install' into 'filesystem' and # make 'filesystem' the default 'filesystem', - 'm4', 'wix', #'midl', 'msvs', # Parser generators 'lex', 'yacc', @@ -814,7 +816,7 @@ def tool_list(platform, env): 'dvipdf', 'dvips', 'gs', 'tex', 'latex', 'pdflatex', 'pdftex', # Archivers - 'tar', 'zip', 'rpm', + 'tar', 'zip', # SourceCode factories 'BitKeeper', 'CVS', 'Perforce', 'RCS', 'SCCS', # 'Subversion', |