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

[Martin Storsjö via Phabricator via cfe-commits]

mstorsjo created this revision.

https://reviews.llvm.org/D37133

Files:
  utils/merge_archives.py


Index: utils/merge_archives.py
===================================================================
--- utils/merge_archives.py
+++ utils/merge_archives.py
@@ -120,6 +120,8 @@
 
     files = glob.glob(os.path.join(temp_directory_root, '*.o'))
     if not files:
+        files = glob.glob(os.path.join(temp_directory_root, '*.obj'))
+    if not files:
         print_and_exit('Failed to glob for %s' % glob_path)
     cmd = [ar_exe, '-qc', args.output] + files
     execute_command_verbose(cmd, cwd=temp_directory_root, verbose=args.verbose)



Index: utils/merge_archives.py
===================================================================
--- utils/merge_archives.py
+++ utils/merge_archives.py
@@ -120,6 +120,8 @@
 
     files = glob.glob(os.path.join(temp_directory_root, '*.o'))
     if not files:
+        files = glob.glob(os.path.join(temp_directory_root, '*.obj'))
+    if not files:
         print_and_exit('Failed to glob for %s' % glob_path)
     cmd = [ar_exe, '-qc', args.output] + files
     execute_command_verbose(cmd, cwd=temp_directory_root, verbose=args.verbose)

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits