diff options
| author | sdefresne <sdefresne@chromium.org> | 2016-02-05 03:07:50 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-05 11:08:44 +0000 |
| commit | db4a8df70e3521a6d555723356bdae37f95d7ff6 (patch) | |
| tree | d0278089a5c6438feaff6475d09d6d2d4a88ef3f /ios | |
| parent | 4c28097b647455bc37e5bb7319847430aba2b56f (diff) | |
| download | chromium_src-db4a8df70e3521a6d555723356bdae37f95d7ff6.zip chromium_src-db4a8df70e3521a6d555723356bdae37f95d7ff6.tar.gz chromium_src-db4a8df70e3521a6d555723356bdae37f95d7ff6.tar.bz2 | |
Silence libtool warning when building libcrnet_standalone.a.
Port code from tools/gyp/pylib/gyp/mac_tool.py to silence libtool
warning to ios/build/packaging/link_dependencies.py.
Add dependency on ios/build/packaging/link_dependencies.py for
target that invoke it so that they are rebuilt when the script
is updated.
BUG=None
Review URL: https://codereview.chromium.org/1670613002
Cr-Commit-Position: refs/heads/master@{#373784}
Diffstat (limited to 'ios')
| -rwxr-xr-x | ios/build/packaging/link_dependencies.py | 12 | ||||
| -rw-r--r-- | ios/crnet/crnet_pack.gyp | 5 |
2 files changed, 14 insertions, 3 deletions
diff --git a/ios/build/packaging/link_dependencies.py b/ios/build/packaging/link_dependencies.py index df541a6..94e612e 100755 --- a/ios/build/packaging/link_dependencies.py +++ b/ios/build/packaging/link_dependencies.py @@ -16,7 +16,9 @@ static library that should be produced. For example: import argparse import os +import re import subprocess +import sys class SubprocessError(Exception): @@ -126,8 +128,14 @@ def link(output, inputs): output: file system path to desired output library inputs: list of file system paths to input libraries """ - p = subprocess.Popen(['libtool', '-o', output] + inputs) - p.communicate() + libtool_re = re.compile(r'^.*libtool: (?:for architecture: \S* )?' + r'file: .* has no symbols$') + p = subprocess.Popen( + ['libtool', '-o', output] + inputs, stderr=subprocess.PIPE) + _, err = p.communicate() + for line in err.splitlines(): + if not libtool_re.match(line): + print >>sys.stderr, line if p.returncode != 0: message = "subprocess libtool returned {0}".format(p.returncode) raise SubprocessError(message) diff --git a/ios/crnet/crnet_pack.gyp b/ios/crnet/crnet_pack.gyp index 81b2e78b..79d6545 100644 --- a/ios/crnet/crnet_pack.gyp +++ b/ios/crnet/crnet_pack.gyp @@ -48,7 +48,10 @@ }, # Actions need an inputs list, even if it's empty. - 'inputs': [], + 'inputs': [ + '<(tool_path)', + '<(PRODUCT_DIR)/crnet_dummy.app/crnet_dummy', + ], # Only specify one output, since this will be libtool's output. 'outputs': [ '<(PRODUCT_DIR)/libcrnet_standalone.a' ], 'action': ['<(tool_path)', |