[PATCH] D37133: [libc++] Handle object files named *.obj in merge_archives.py

[Martin Storsjö via Phabricator via cfe-commits]

mstorsjo updated this revision to Diff 114893.
mstorsjo added a comment.

Using `*.o*` instead of checking `*.obj` separately.


https://reviews.llvm.org/D37133

Files:
  utils/merge_archives.py


Index: utils/merge_archives.py
===================================================================
--- utils/merge_archives.py
+++ 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: utils/merge_archives.py
===================================================================
--- utils/merge_archives.py
+++ 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