diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-23 21:22:35 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-23 21:22:35 +0000 |
| commit | 68c73b083028bb08744fbb87faba45a9e2ab6614 (patch) | |
| tree | 97f56910e4e4713d3c901bec8e5a476fcdc1e9be /site_scons/site_tools/concat_source.py | |
| parent | d2d89baed092e57c107dc801b2a9ce3e0f6d4327 (diff) | |
| download | chromium_src-68c73b083028bb08744fbb87faba45a9e2ab6614.zip chromium_src-68c73b083028bb08744fbb87faba45a9e2ab6614.tar.gz chromium_src-68c73b083028bb08744fbb87faba45a9e2ab6614.tar.bz2 | |
Pulling in latest software construction toolkit.
Review URL: http://codereview.chromium.org/8117
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'site_scons/site_tools/concat_source.py')
| -rw-r--r-- | site_scons/site_tools/concat_source.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/site_scons/site_tools/concat_source.py b/site_scons/site_tools/concat_source.py index 9a34f50..c67463b 100644 --- a/site_scons/site_tools/concat_source.py +++ b/site_scons/site_tools/concat_source.py @@ -60,7 +60,7 @@ def ConcatSourceBuilder(target, source, env): source_path = str(source_file) - if 'msvc' in env['TOOLS']: + if env.get('CC') == 'cl': # Add message pragma for nicer progress indication when building with # MSVC. output_lines.append('#pragma message("--%s")' % ( @@ -68,11 +68,9 @@ def ConcatSourceBuilder(target, source, env): output_lines.append('#include "%s"' % source_path) - # Need an EOL at the end of the file for more finicky build tools - output_lines.append('\n') - output_file = open(str(target[0]), 'w') - output_file.write('\n'.join(output_lines)) + # Need an EOL at the end of the file for more finicky build tools + output_file.write('\n'.join(output_lines) + '\n') output_file.close() |