[embedded] When copying clang builtins from host toolchain, include macho_embedded libraries

Author: kubamracek

utils/build-script-impl

@@ -1437,95 +1437,6 @@ function cmake_config_opt() {
     fi
 }
 
-function copy_lib_stripping_architecture() {
-    local source="$1"
-    local dest="$2"
-    local arch="$3"
-
-    # An alternative approach would be to use || to first
-    # attempt the removal of the slice and fall back to the
-    # copy when failing.
-    # However, this would leave unneeded error messages in the logs
-    # that may hinder investigation; in addition, in this scenario
-    # the `call` function seems to not propagate correctly failure
-    # exit codes.
-    if lipo -archs "${source}" | grep -q "${arch}"; then
-        call lipo -remove "${arch}" "${source}" -output "${dest}"
-    else
-        call cp "${source}" "${dest}"
-    fi
-}
-
-function copy_embedded_compiler_rt_builtins_from_darwin_host_toolchain() {
-    local clang_dest_dir="$1"
-
-    HOST_CXX_DIR=$(dirname "${HOST_CXX}")
-    HOST_LIB_CLANG_DIR="${HOST_CXX_DIR}/../lib/clang"
-    DEST_LIB_CLANG_DIR="${clang_dest_dir}/lib/clang"
-
-    [ -d "${HOST_LIB_CLANG_DIR}" -a -d "${DEST_LIB_CLANG_DIR}" ] || return 0
-
-    DEST_CXX_BUILTINS_VERSION=$(ls -1 "${DEST_LIB_CLANG_DIR}")
-    DEST_BUILTINS_DIR="${clang_dest_dir}/lib/clang/${DEST_CXX_BUILTINS_VERSION}/lib/darwin"
-
-    if [[ -d "${DEST_BUILTINS_DIR}" ]]; then
-        for HOST_CXX_BUILTINS_PATH in "${HOST_LIB_CLANG_DIR}"/*; do
-            HOST_CXX_BUILTINS_DIR="${HOST_CXX_BUILTINS_PATH}/lib/darwin"
-            echo "copying compiler-rt embedded builtins from ${HOST_CXX_BUILTINS_DIR} into the local clang build directory ${DEST_BUILTINS_DIR}."
-
-            for OS in ios watchos tvos; do
-                # Copy over the device .a when necessary
-                LIB_NAME="libclang_rt.$OS.a"
-                HOST_LIB_PATH="$HOST_CXX_BUILTINS_DIR/$LIB_NAME"
-                DEST_LIB_PATH="${DEST_BUILTINS_DIR}/${LIB_NAME}"
-                if [[ ! -f "${DEST_LIB_PATH}" ]]; then
-                    if [[ -f "${HOST_LIB_PATH}" ]]; then
-                        if [[ "$OS" == "tvos" ]]; then
-                            # This is to avoid strip failures when generating a toolchain
-                            copy_lib_stripping_architecture "${HOST_LIB_PATH}" "${DEST_LIB_PATH}" i386
-                        else
-                           call cp "${HOST_LIB_PATH}" "${DEST_LIB_PATH}"
-                        fi
-                    elif [[ "${VERBOSE_BUILD}" ]]; then
-                        echo "no file exists at ${HOST_LIB_PATH}"
-                    fi
-                fi
-
-                # Copy over the simulator .a when necessary
-                SIM_LIB_NAME="libclang_rt.${OS}sim.a"
-                HOST_SIM_LIB_PATH="$HOST_CXX_BUILTINS_DIR/$SIM_LIB_NAME"
-                DEST_SIM_LIB_PATH="${DEST_BUILTINS_DIR}/${SIM_LIB_NAME}"
-                if [[ ! -f "${DEST_SIM_LIB_PATH}" ]]; then
-                    if [[ -f "${HOST_SIM_LIB_PATH}" ]]; then
-                        if [[ "$OS" == "tvos" ]]; then
-                            # This is to avoid strip failures when generating a toolchain
-                            copy_lib_stripping_architecture "${HOST_SIM_LIB_PATH}" "${DEST_SIM_LIB_PATH}" i386
-                        else
-                            call cp "${HOST_SIM_LIB_PATH}" "${DEST_SIM_LIB_PATH}"
-                        fi
-                    elif [[ -f "${HOST_LIB_PATH}" ]]; then
-                        # The simulator .a might not exist if the host
-                        # Xcode is old. In that case, copy over the
-                        # device library to the simulator location to allow
-                        # clang to find it. The device library has the simulator
-                        # slices in Xcode that doesn't have the simulator .a, so
-                        # the link is still valid.
-                        echo "copying over faux-sim library ${HOST_LIB_PATH} to ${SIM_LIB_NAME}"
-                        if [[ "$OS" == "tvos" ]]; then
-                            echo "Remove i386 from tvOS ${DEST_SIM_LIB_PATH}"
-                            call lipo -remove i386 "${HOST_LIB_PATH}" -output "${DEST_SIM_LIB_PATH}"
-                        else
-                            call cp "${HOST_LIB_PATH}" "${DEST_SIM_LIB_PATH}"
-                        fi
-                    elif [[ "${VERBOSE_BUILD}" ]]; then
-                        echo "no file exists at ${HOST_SIM_LIB_PATH}"
-                    fi
-                fi
-            done
-        done
-    fi
-}
-
 #
 # Configure and build each product
 #

utils/swift_build_support/swift_build_support/products/llvm.py

@@ -185,6 +185,18 @@ def copy_embedded_compiler_rt_builtins_from_darwin_host_toolchain(
                         elif self.args.verbose_build:
                             print('no file exists at {}', host_sim_lib_path)
 
+                os.makedirs(os.path.join(dest_builtins_dir, 'macho_embedded'), exist_ok=True)
+                for _flavor in ['hard_pic', 'hard_static', 'soft_pic', 'soft_static']:
+                    # Copy over the macho_embedded .a when necessary
+                    lib_name = os.path.join('macho_embedded', 'libclang_rt.{}.a'.format(_flavor))
+                    host_lib_path = os.path.join(host_cxx_builtins_dir, lib_name)
+                    dest_lib_path = os.path.join(dest_builtins_dir, lib_name)
+                    if not os.path.isfile(dest_lib_path):
+                        if os.path.isfile(host_lib_path):
+                            shutil.copy(host_lib_path, dest_lib_path)
+                        elif self.args.verbose_build:
+                            print('no file exists at {}'.format(host_lib_path))
+
     def should_build(self, host_target):
         """should_build() -> Bool