From 2c607f47f95f77ca8c7a4bd50946a300a62b7c94 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Tue, 12 Sep 2017 20:54:15 +0000 Subject: [PATCH] Handle object files named *.obj in merge_archives.py Differential Revision: https://reviews.llvm.org/D37133 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@313072 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/merge_archives.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/merge_archives.py b/utils/merge_archives.py index 856dd3bfa..db101da5c 100755 --- a/utils/merge_archives.py +++ b/utils/merge_archives.py @@ -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