summaryrefslogtreecommitdiff
path: root/tools/gyp/pylib/gyp/mac_tool.py
diff options
context:
space:
mode:
authorRefael Ackermann <refack@gmail.com>2017-08-09 14:43:18 -0400
committerRefael Ackermann <refack@gmail.com>2017-08-23 16:24:28 -0400
commit327077ce43866020eadaf3b58f7280a09ed0c348 (patch)
tree04002b9263e8c89a2402af3243d7910f8abe76c2 /tools/gyp/pylib/gyp/mac_tool.py
parent01160dd6e901c7b3e70508c16bd8654e312d8486 (diff)
downloadandroid-node-v8-327077ce43866020eadaf3b58f7280a09ed0c348.tar.gz
android-node-v8-327077ce43866020eadaf3b58f7280a09ed0c348.tar.bz2
android-node-v8-327077ce43866020eadaf3b58f7280a09ed0c348.zip
tools: update GYP to 324dd166
PR-URL: https://github.com/nodejs/node/pull/14718 Refs: https://chromium.googlesource.com/external/gyp/+/324dd166b7c0b39d513026fa52d6280ac6d56770 Refs: https://github.com/refack/GYP/commit/324dd166b7c0b39d513026fa52d6280ac6d56770 Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'tools/gyp/pylib/gyp/mac_tool.py')
-rwxr-xr-xtools/gyp/pylib/gyp/mac_tool.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/tools/gyp/pylib/gyp/mac_tool.py b/tools/gyp/pylib/gyp/mac_tool.py
index b0363cc393..0ad7e7a1b6 100755
--- a/tools/gyp/pylib/gyp/mac_tool.py
+++ b/tools/gyp/pylib/gyp/mac_tool.py
@@ -105,17 +105,21 @@ class MacTool(object):
ibtool_section_re = re.compile(r'/\*.*\*/')
ibtool_re = re.compile(r'.*note:.*is clipping its content')
- ibtoolout = subprocess.Popen(args, stdout=subprocess.PIPE)
+ try:
+ stdout = subprocess.check_output(args)
+ except subprocess.CalledProcessError as e:
+ print(e.output)
+ raise
current_section_header = None
- for line in ibtoolout.stdout:
+ for line in stdout.splitlines():
if ibtool_section_re.match(line):
current_section_header = line
elif not ibtool_re.match(line):
if current_section_header:
- sys.stdout.write(current_section_header)
+ print(current_section_header)
current_section_header = None
- sys.stdout.write(line)
- return ibtoolout.returncode
+ print(line)
+ return 0
def _ConvertToBinary(self, dest):
subprocess.check_call([