This revision was automatically updated to reflect the committed changes.
Closed by commit rL313072: Handle object files named *.obj in merge_archives.py
(authored by mstorsjo).
Changed prior to commit:
https://reviews.llvm.org/D37133?vs=114893&id=114906#toc
Repository:
rL LLVM
https://reviews.llvm.org/D37133
Files:
libcxx/trunk/utils/merge_archives.py
Index: libcxx/trunk/utils/merge_archives.py
===================================================================
--- libcxx/trunk/utils/merge_archives.py
+++ libcxx/trunk/utils/merge_archives.py
@@ -118,7 +118,7 @@
execute_command_verbose([ar_exe, '-x', arc], cwd=temp_directory_root,
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:
print_and_exit('Failed to glob for %s' % glob_path)
cmd = [ar_exe, '-qc', args.output] + files
Index: libcxx/trunk/utils/merge_archives.py
===================================================================
--- libcxx/trunk/utils/merge_archives.py
+++ libcxx/trunk/utils/merge_archives.py
@@ -118,7 +118,7 @@
execute_command_verbose([ar_exe, '-x', arc], cwd=temp_directory_root,
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:
print_and_exit('Failed to glob for %s' % glob_path)
cmd = [ar_exe, '-qc', args.output] + files
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
