This is an archive of the discontinued LLVM Phabricator instance.

[libcxx] When merging archives, build index even on Darwin
ClosedPublic

Authored by phosek on Feb 5 2020, 7:44 PM.

Download Raw Diff

Details

Reviewers

ldionne
EricWF
mclow.lists

Commits

rG603acd962670: [libcxx] When merging archives, build index even on Darwin

Summary

We always want to build the table of contents. Additionally, we also
set the flag to make the output deterministic which is already the
default for llvm-ar.

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

phosek created this revision.Feb 5 2020, 7:44 PM

Herald added a project: Restricted Project. · View Herald TranscriptFeb 5 2020, 7:44 PM

Herald added subscribers: libcxx-commits, arphaman, dexonsmith, christof. · View Herald Transcript

Ping?

Herald added a reviewer: mclow.lists. · View Herald TranscriptFeb 10 2020, 1:54 PM

Ping again?

LGTM

This revision was not accepted when it landed; it landed in state Needs Review.Mar 2 2020, 11:38 AM

Closed by commit rG603acd962670: [libcxx] When merging archives, build index even on Darwin (authored by phosek). · Explain Why

This revision was automatically updated to reflect the committed changes.

Sorry, this slipped through the cracks. LGTM

phosek mentioned this in rGdffbaa401421: [libcxx] Drop -D option from libtool when merging archives.Mar 2 2020, 4:38 PM

Revision Contents

Path

Size

libcxx/

utils/

merge_archives.py

4 lines

Diff 247699

libcxx/utils/merge_archives.py

Show First 20 Lines • Show All 137 Lines • ▼ Show 20 Lines	def main():
for arc in archives:		for arc in archives:
execute_command_verbose([ar_exe, 'x', arc],		execute_command_verbose([ar_exe, 'x', arc],
cwd=temp_directory_root, verbose=args.verbose)		cwd=temp_directory_root, verbose=args.verbose)
out = execute_command_verbose([ar_exe, 't', arc])		out = execute_command_verbose([ar_exe, 't', arc])
files.extend(out.splitlines())		files.extend(out.splitlines())

if args.use_libtool:		if args.use_libtool:
files = [f for f in files if not f.startswith('__.SYMDEF')]		files = [f for f in files if not f.startswith('__.SYMDEF')]
execute_command_verbose([libtool_exe, '-static', '-o', args.output] + files,		execute_command_verbose([libtool_exe, '-static', '-o', args.output, '-sD'] + files,
cwd=temp_directory_root, verbose=args.verbose)		cwd=temp_directory_root, verbose=args.verbose)
else:		else:
execute_command_verbose([ar_exe, 'rcs', args.output] + files,		execute_command_verbose([ar_exe, 'rcsD', args.output] + files,
cwd=temp_directory_root, verbose=args.verbose)		cwd=temp_directory_root, verbose=args.verbose)


if __name__ == '__main__':		if __name__ == '__main__':
main()		main()
exit_with_cleanups(0)		exit_with_cleanups(0)