Merge "Get Darwin Clang target libs from Linux."

1 files changed, 15 insertions, 0 deletions

diff --git a/checkbuild.py b/checkbuild.py
index 34abe67da..a9a87d5ca 100755
--- a/checkbuild.py
+++ b/checkbuild.py
@@ -315,6 +315,21 @@ class Clang(ndk.builds.Module):
             os.rename(os.path.join(libs_path, 'LLVMgold.dylib'),
                       os.path.join(libs_path, 'LLVMgold.so'))
 
+            # We don't build target binaries as part of the Darwin build. The
+            # Darwin toolchains need to get these from the Linux prebuilts.
+            #
+            # The headers and libraries we care about are all in lib64/clang
+            # for both toolchains, and those two are intended to be identical
+            # between each host, so we can just replace Darwin's with the one
+            # from the Linux toolchain.
+            linux_prebuilt_path = self.get_prebuilt_path('linux')
+
+            clanglib_dir = 'lib64/clang'
+            install_clanglib = os.path.join(install_path, clanglib_dir)
+            linux_clanglib = os.path.join(linux_prebuilt_path, clanglib_dir)
+            shutil.rmtree(install_clanglib)
+            shutil.copytree(linux_clanglib, install_clanglib)
+
 
 def get_gcc_prebuilt_path(host):
     rel_prebuilt_path = 'prebuilts/ndk/current/toolchains/{}'.format(host)