Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(521)

Unified Diff: pylib/gyp/mac_tool.py

Issue 879343004: mac: Followup to ZERO_AR_DATE, touch the -o archive, rather than expecting only one (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@master
Patch Set: . Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | test/mac/libtool-zero/test.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pylib/gyp/mac_tool.py
diff --git a/pylib/gyp/mac_tool.py b/pylib/gyp/mac_tool.py
index 5fbf68e986d531a0f3b5b8dc55c524a0b25c1031..3ef16b23a8f6b243c374e2fcb544735e01a4e59d 100755
--- a/pylib/gyp/mac_tool.py
+++ b/pylib/gyp/mac_tool.py
@@ -234,14 +234,13 @@ class MacTool(object):
for line in err.splitlines():
if not libtool_re.match(line) and not libtool_re5.match(line):
print >>sys.stderr, line
- # Unconditionally touch any file .a file on the command line if present if
- # succeeded. A bit hacky.
+ # Unconditionally touch the output .a file on the command line if present
+ # and the command succeeded. A bit hacky.
if not libtoolout.returncode:
- archives = [
- cmd for cmd in cmd_list if cmd.endswith('.a') and os.path.isfile(cmd)
- ]
- if len(archives) == 1:
- os.utime(archives[0], None)
+ for i in range(len(cmd_list) - 1):
+ if cmd_list[i] == "-o" and cmd_list[i+1].endswith('.a'):
+ os.utime(cmd_list[i+1], None)
+ break
return libtoolout.returncode
def ExecPackageFramework(self, framework, version):
« no previous file with comments | « no previous file | test/mac/libtool-zero/test.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698