diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-18 22:08:27 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-18 22:08:27 +0000 |
commit | 486a95a7d9b19cf79f61ab3bb98b701a043452f6 (patch) | |
tree | 06158a8dd5fe611f3797ed649b6621da5f0bc0ac /tools/compile_test/compile_test.py | |
parent | 6637a295b33c1a52bde45384e5b546da4c9b2752 (diff) | |
download | chromium_src-486a95a7d9b19cf79f61ab3bb98b701a043452f6.zip chromium_src-486a95a7d9b19cf79f61ab3bb98b701a043452f6.tar.gz chromium_src-486a95a7d9b19cf79f61ab3bb98b701a043452f6.tar.bz2 |
Linux: fix compatibility with libwebp-0.3 for use_system_libwebp=1 case.
R=jzern
TBR=darin
BUG=none
Review URL: https://codereview.chromium.org/14328020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195016 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/compile_test/compile_test.py')
-rwxr-xr-x | tools/compile_test/compile_test.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/compile_test/compile_test.py b/tools/compile_test/compile_test.py index a52c072..79371a1f 100755 --- a/tools/compile_test/compile_test.py +++ b/tools/compile_test/compile_test.py @@ -21,6 +21,7 @@ import tempfile def DoMain(argv): parser = optparse.OptionParser() parser.add_option('--code') + parser.add_option('--run-linker', action='store_true') parser.add_option('--on-success', default='') parser.add_option('--on-failure', default='') @@ -39,7 +40,12 @@ def DoMain(argv): o_path = os.path.join(tmpdir, 'test.o') - cxx_popen = subprocess.Popen([cxx, cxx_path, '-o', o_path, '-c'], + cxx_cmdline = [cxx, cxx_path, '-o', o_path] + if not options.run_linker: + cxx_cmdline.append('-c') + # Pass remaining arguments to the compiler. + cxx_cmdline += args + cxx_popen = subprocess.Popen(cxx_cmdline, stdout=subprocess.PIPE, stderr=subprocess.PIPE) cxx_stdout, cxx_stderr = cxx_popen.communicate() |