Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tools: pull xcode_emulation.py fixes from node-gyp #30272

Closed
wants to merge 2 commits into from
Closed

tools: pull xcode_emulation.py fixes from node-gyp #30272

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60d7efc
tools: pull xcode_emulation.py from node-gyp
cclauss Nov 5, 2019
e2739cc
fixup! Add mac_tool.py changes
cclauss Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup! Add mac_tool.py changes
  • Loading branch information
@cclauss
cclauss committed Nov 5, 2019
commit e2739cc060ec1314dddc4a6171ba64ca467dd386
4 changes: 4 additions & 0 deletions tools/gyp/pylib/gyp/mac_tool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import sys
import tempfile

PY3 = bytes != str


def main(args):
executor = MacTool()
Expand Down Expand Up @@ -263,6 +265,8 @@ def ExecFilterLibtool(self, *cmd_list):
env['ZERO_AR_DATE'] = '1'
libtoolout = subprocess.Popen(cmd_list, stderr=subprocess.PIPE, env=env)
_, err = libtoolout.communicate()
if PY3:
err = err.decode('utf-8')
for line in err.splitlines():
if not libtool_re.match(line) and not libtool_re5.match(line):
print(line, file=sys.stderr)
Expand Down