diff options
| author | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-12 21:34:25 +0000 |
|---|---|---|
| committer | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-12 21:34:25 +0000 |
| commit | 21f0460726afc4927c2df9b389a68074f21340d5 (patch) | |
| tree | 4e1adb7b5ac3afa5d45c1decfb1c143134f863ff /chrome_frame/combine_libs.py | |
| parent | 201028d68651c5c2d6f848e98f844d8f0820b0ac (diff) | |
| download | chromium_src-21f0460726afc4927c2df9b389a68074f21340d5.zip chromium_src-21f0460726afc4927c2df9b389a68074f21340d5.tar.gz chromium_src-21f0460726afc4927c2df9b389a68074f21340d5.tar.bz2 | |
make combine_libs.py not bail out when run under the system provided python under Cygwin.
BUG=35342
TEST=in cygwin do: %> devenv /build Debug chrome.sln
Review URL: http://codereview.chromium.org/593087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/combine_libs.py')
| -rw-r--r-- | chrome_frame/combine_libs.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/combine_libs.py b/chrome_frame/combine_libs.py index 97d3de7..5a2efec 100644 --- a/chrome_frame/combine_libs.py +++ b/chrome_frame/combine_libs.py @@ -1,4 +1,4 @@ -# Copyright (c) 2009 The Chromium Authors. All rights reserved. +# Copyright (c) 2010 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -51,7 +51,7 @@ def CombineLibraries(output, remove_re, inputs): removals = [] if remove_re: removals = CollectRemovals(remove_re, inputs) - + print removals args = ['lib.exe', '/out:%s' % output] @@ -100,7 +100,7 @@ def Main(): else: remove_re = None - if sys.platform != 'win32': + if sys.platform != 'win32' and sys.platform != 'cygwin': parser.error('this script only works on Windows for now') # If this is set, we can't capture lib.exe's output. |