[libcxx] r313072 - Handle object files named *.obj in merge_archives.py

[Martin Storsjo via cfe-commits]

Author: mstorsjo
Date: Tue Sep 12 13:54:15 2017
New Revision: 313072

URL: http://llvm.org/viewvc/llvm-project?rev=313072&view=rev
Log:
Handle object files named *.obj in merge_archives.py

Differential Revision: https://reviews.llvm.org/D37133

Modified:
    libcxx/trunk/utils/merge_archives.py

Modified: libcxx/trunk/utils/merge_archives.py
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/utils/merge_archives.py?rev=313072&r1=313071&r2=313072&view=diff
==============================================================================
--- libcxx/trunk/utils/merge_archives.py (original)
+++ libcxx/trunk/utils/merge_archives.py Tue Sep 12 13:54:15 2017
@@ -118,7 +118,7 @@ def main():
         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