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

[mstorsjo]

Ping

[compnerd]

I think we should avoid this logic entirely and use CMake to do this.

[mstorsjo]

Do you have any pointers on how to do it with CMake?

[compnerd]

$<TARGET_OBJECTS:${LIBCXX_ABI_LIBRARY}> should give you the .o or .obj files used to construct the library.

[mstorsjo]

In D37133#860563, @compnerd wrote:

$<TARGET_OBJECTS:${LIBCXX_ABI_LIBRARY}> should give you the .o or .obj files used to construct the library.

I guess that would only work if they're built all as part of the same CMake invocation? In the setup where I'm trying this (for bootstrapping a MinGW environment), they're built standalone, with the libcxx cmake invocation pointing to the built libcxxabi static library.

[mstorsjo]

Ping @EricWF, who added this script

[EricWF]

In D37133#860549, @compnerd wrote:

I think we should avoid this logic entirely and use CMake to do this.

It's not that easy to do in CMake, and a CMake solution would be limited to only
merging in-tree builds together. This script allows merging any two static libraries,
including merging an installed libc++abi into an in-tree libc++ build.

Obviously I'm biased because I wrote the script initially, but I still prefer a python
solution.

[EricWF]

utils/merge_archives.py

121 ↗

(On Diff #112666)

How about simply using *.o*?

[mstorsjo]

utils/merge_archives.py

121 ↗

(On Diff #112666)

Sure, that would probably work as well.

[mstorsjo]

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

libcxx/trunk/utils/merge_archives.py

def main():
 
     global temp_directory_root
     temp_directory_root = tempfile.mkdtemp('.libcxx.merge.archives')
 
     for arc in archives:
         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
     execute_command_verbose(cmd, cwd=temp_directory_root, verbose=args.verbose)
 
 
 if __name__ == '__main__':
     main()
     exit_with_cleanups(0)