This is an archive of the discontinued LLVM Phabricator instance.

Differential D88449

[libcxx] Don't pass -s to libtool
ClosedPublic

Authored by phosek on Sep 28 2020, 2:20 PM.

Details

Reviewers
smeenai
ldionne
Group Reviewers
Restricted Project
Commits
rG2d657d1bd7f1: [libcxx] Don't pass -s to libtool
Summary

This flag is the default in libtool on Darwin, and it's not supported
by llvm-libtool-darwin causing a build failure.

Diff Detail

Event Timeline

phosek created this revision.Sep 28 2020, 2:20 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 28 2020, 2:20 PM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added subscribers: libcxx-commits, dexonsmith. · View Herald Transcript
phosek requested review of this revision.Sep 28 2020, 2:20 PM
phosek mentioned this in D88157: [CMake] Make sure _cmake_system_name has a default.
ldionne accepted this revision.Sep 28 2020, 2:21 PM
This revision is now accepted and ready to land.Sep 28 2020, 2:21 PM
Harbormaster completed remote builds in B73233: Diff 294807.Sep 28 2020, 2:22 PM
This revision was landed with ongoing or failed builds.Sep 28 2020, 2:50 PM
Closed by commit rG2d657d1bd7f1: [libcxx] Don't pass -s to libtool (authored by phosek). · Explain Why
This revision was automatically updated to reflect the committed changes.
phosek added a commit: rG2d657d1bd7f1: [libcxx] Don't pass -s to libtool.

Revision Contents

PathSize
libcxx/
utils/
2 lines

Diff 294812

libcxx/utils/merge_archives.py

Show First 20 Lines • Show All 137 Lines • ▼ Show 20 Linesdef 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, '-s'] + files, execute_command_verbose([libtool_exe, '-static', '-o', args.output] + 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, 'rcs', 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)