REMOVE ME: Testing compiler-rt installation

Author: drexin

utils/build_swift/build_swift/driver_arguments.py

@@ -729,12 +729,10 @@ def create_argument_parser():
 
     option('--skip-build-clang-tools-extra',
            toggle_false('build_clang_tools_extra'),
-           default=True,
            help='skip building clang-tools-extra as part of llvm')
 
     option('--skip-build-compiler-rt',
            toggle_false('build_compiler_rt'),
-           default=True,
            help='skip building compiler-rt as part of llvm')
 
     # -------------------------------------------------------------------------

utils/swift_build_support/swift_build_support/products/llvm.py

@@ -142,8 +142,10 @@ def copy_embedded_compiler_rt_builtins_from_darwin_host_toolchain(
 
         #     [ -d "${HOST_LIB_CLANG_DIR}" -a -d "${DEST_LIB_CLANG_DIR}" ] || return 0
 
-        if not os.path.exists(host_lib_clang_dir) or \
-           not os.path.exists(dest_lib_clang_dir):
+        if not os.path.exists(host_lib_clang_dir):
+            return 0
+
+        if not os.path.exists(dest_lib_clang_dir):
             return 0
 
         #     DEST_CXX_BUILTINS_VERSION=$(ls -1 "${DEST_LIB_CLANG_DIR}")
@@ -673,7 +675,6 @@ def install(self, host_target):
         self.install_with_cmake(install_targets, host_install_destdir)
 
         if self.args.llvm_install_components and system() == 'Darwin':
-            clang_dest_dir = '{}{}'.format(host_install_destdir,
-                                           targets.install_prefix())
+            clang_dest_dir = self.install_toolchain_path(host_target)
             self.copy_embedded_compiler_rt_builtins_from_darwin_host_toolchain(
                 clang_dest_dir)