diff options
| author | Martin Storsjo <martin@martin.st> | 2017-09-12 20:54:15 +0000 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2017-09-12 20:54:15 +0000 |
| commit | 499f58a54838dd63f8b295ec37d6de711ef270c4 (patch) | |
| tree | a3822b2aed66affecd9d50a33671a37bb833d2dd /libcxx/utils/merge_archives.py | |
| parent | 2890105eab08ef55b624642000e5225fb7a46e0a (diff) | |
| download | bcm5719-llvm-499f58a54838dd63f8b295ec37d6de711ef270c4.tar.gz bcm5719-llvm-499f58a54838dd63f8b295ec37d6de711ef270c4.zip | |
Handle object files named *.obj in merge_archives.py
Differential Revision: https://reviews.llvm.org/D37133
llvm-svn: 313072
Diffstat (limited to 'libcxx/utils/merge_archives.py')
| -rwxr-xr-x | libcxx/utils/merge_archives.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/utils/merge_archives.py b/libcxx/utils/merge_archives.py index 856dd3bfae9..db101da5cca 100755 --- a/libcxx/utils/merge_archives.py +++ b/libcxx/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 |
