@@ -2929,23 +2929,24 @@ for host in "${ALL_HOSTS[@]}"; do
2929
2929
if [[ " ${product} " == " llvm" && " ${BUILD_LLVM} " == " 1" ]]; then
2930
2930
if [[ " $( uname -s) " == " Darwin" ]] ; then
2931
2931
HOST_CXX_DIR=$( dirname " ${HOST_CXX} " )
2932
- HOST_CXX_BUILTINS_VERSION=$( ls " $HOST_CXX_DIR /../lib/clang" | awk ' {print $0}' )
2933
- HOST_CXX_BUILTINS_DIR=" $HOST_CXX_DIR /../lib/clang/$HOST_CXX_BUILTINS_VERSION /lib/darwin"
2934
2932
DEST_CXX_BUILTINS_VERSION=$( ls " $( build_directory_bin ${host} llvm) /../lib/clang" | awk ' {print $0}' )
2935
2933
DEST_BUILTINS_DIR=" $( build_directory_bin ${host} llvm) /../lib/clang/$DEST_CXX_BUILTINS_VERSION /lib/darwin"
2936
2934
2937
2935
if [ -d " $DEST_BUILTINS_DIR " ]; then
2938
- echo " copying compiler-rt embedded builtins into the local clang build directory $DEST_BUILTINS_DIR ."
2939
-
2940
- if [ -f " $HOST_CXX_BUILTINS_DIR /libclang_rt.ios.a" ]; then
2941
- call cp " $HOST_CXX_BUILTINS_DIR /libclang_rt.ios.a" " $DEST_BUILTINS_DIR /libclang_rt.ios.a"
2942
- fi
2943
- if [ -f " $HOST_CXX_BUILTINS_DIR /libclang_rt.watchos.a" ]; then
2944
- call cp " $HOST_CXX_BUILTINS_DIR /libclang_rt.watchos.a" " $DEST_BUILTINS_DIR /libclang_rt.watchos.a"
2945
- fi
2946
- if [ -f " $HOST_CXX_BUILTINS_DIR /libclang_rt.tvos.a" ]; then
2947
- call cp " $HOST_CXX_BUILTINS_DIR /libclang_rt.tvos.a" " $DEST_BUILTINS_DIR /libclang_rt.tvos.a"
2948
- fi
2936
+ for HOST_CXX_BUILTINS_PATH in " $HOST_CXX_DIR /../lib/clang" /* ; do
2937
+ HOST_CXX_BUILTINS_DIR=" $HOST_CXX_BUILTINS_PATH /lib/darwin"
2938
+ echo " copying compiler-rt embedded builtins from $HOST_CXX_BUILTINS_DIR into the local clang build directory $DEST_BUILTINS_DIR ."
2939
+
2940
+ for OS in ios watchos tvos; do
2941
+ LIB_NAME=" libclang_rt.$OS .a"
2942
+ HOST_LIB_PATH=" $HOST_CXX_BUILTINS_DIR /$LIB_NAME "
2943
+ if [ -f " $HOST_LIB_PATH " ]; then
2944
+ call cp " $HOST_LIB_PATH " " $DEST_BUILTINS_DIR /$LIB_NAME "
2945
+ elif [[ " ${VERBOSE_BUILD} " ]]; then
2946
+ echo " no file exists at $HOST_LIB_PATH "
2947
+ fi
2948
+ done
2949
+ done
2949
2950
fi
2950
2951
fi
2951
2952
fi
0 commit comments