This is an archive of the discontinued LLVM Phabricator instance.

Differential D37728

libcxx: fix merge_archives error variable name
ClosedPublic

Authored by martell on Sep 11 2017, 8:17 PM.

Details

Reviewers
rnk
EricWF
Commits
rGf922501d9815: libcxx: fix merge_archives error variable name
rCXX313084: libcxx: fix merge_archives error variable name
rL313084: libcxx: fix merge_archives error variable name

Diff Detail

Repository
rL LLVM

Event Timeline

martell created this revision.Sep 11 2017, 8:17 PM
EricWF accepted this revision.Sep 12 2017, 3:24 PM
This revision is now accepted and ready to land.Sep 12 2017, 3:24 PM
Closed by commit rL313084: libcxx: fix merge_archives error variable name (authored by martell). · Explain WhySep 12 2017, 3:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
libcxx/
trunk/
utils/
2 lines

Diff 114925

libcxx/trunk/utils/merge_archives.py

Show First 20 Lines • Show All 114 Lines • ▼ Show 20 Linesdef main():
temp_directory_root = tempfile.mkdtemp('.libcxx.merge.archives') temp_directory_root = tempfile.mkdtemp('.libcxx.merge.archives')
for arc in archives: for arc in archives:
execute_command_verbose([ar_exe, '-x', arc], cwd=temp_directory_root, execute_command_verbose([ar_exe, '-x', arc], cwd=temp_directory_root,
verbose=args.verbose) verbose=args.verbose)
files = glob.glob(os.path.join(temp_directory_root, '*.o*')) files = glob.glob(os.path.join(temp_directory_root, '*.o*'))
if not files: if not files:
print_and_exit('Failed to glob for %s' % glob_path) print_and_exit('Failed to glob for %s' % temp_directory_root)
cmd = [ar_exe, '-qc', args.output] + files cmd = [ar_exe, '-qc', args.output] + files
execute_command_verbose(cmd, cwd=temp_directory_root, verbose=args.verbose) execute_command_verbose(cmd, cwd=temp_directory_root, verbose=args.verbose)
if __name__ == '__main__': if __name__ == '__main__':
main() main()
exit_with_cleanups(0) exit_with_cleanups(0)