@@ -2468,13 +2468,15 @@ for host in "${ALL_HOSTS[@]}"; do
2468
2468
executable_target=
2469
2469
results_targets=
2470
2470
if ! [[ " ${SKIP_TEST_SWIFT} " ]]; then
2471
- executable_target=SwiftUnitTests
2472
- results_targets=(" ${SWIFT_TEST_TARGETS[@]} " )
2473
- if [[ " ${STRESS_TEST_SOURCEKIT} " ]]; then
2474
- results_targets=(
2475
- " ${results_targets[@]} "
2476
- stress-SourceKit
2477
- )
2471
+ if ! [[ $( is_cross_tools_host ${host} ) ]] ; then
2472
+ executable_target=SwiftUnitTests
2473
+ results_targets=(" ${SWIFT_TEST_TARGETS[@]} " )
2474
+ if [[ " ${STRESS_TEST_SOURCEKIT} " ]]; then
2475
+ results_targets=(
2476
+ " ${results_targets[@]} "
2477
+ stress-SourceKit
2478
+ )
2479
+ fi
2478
2480
fi
2479
2481
fi
2480
2482
if ! [[ " ${SKIP_TEST_BENCHMARKS} " ]]; then
@@ -2491,6 +2493,10 @@ for host in "${ALL_HOSTS[@]}"; do
2491
2493
if [[ " ${SKIP_TEST_LLDB} " ]]; then
2492
2494
continue
2493
2495
fi
2496
+ if [[ $( is_cross_tools_host ${host} ) ]]; then
2497
+ echo " --- Can't execute tests for ${host} , skipping... ---"
2498
+ continue
2499
+ fi
2494
2500
llvm_build_dir=$( build_directory ${host} llvm)
2495
2501
lldb_build_dir=$( build_directory ${host} lldb)
2496
2502
results_dir=" ${lldb_build_dir} /test-results"
@@ -2786,7 +2792,11 @@ for host in "${ALL_HOSTS[@]}"; do
2786
2792
if [[ " ${LLVM_INSTALL_COMPONENTS} " == " all" ]] ; then
2787
2793
INSTALL_TARGETS=install
2788
2794
elif [[ -n " ${LLVM_INSTALL_COMPONENTS} " ]] ; then
2789
- INSTALL_TARGETS=install-$( echo ${LLVM_INSTALL_COMPONENTS} | sed -E ' s/;/ install-/g' )
2795
+ if [[ $( is_cross_tools_host ${host} ) && " ${LLVM_INSTALL_COMPONENTS} " == * " compiler-rt" * ]]; then
2796
+ INSTALL_TARGETS=install-$( echo ${LLVM_INSTALL_COMPONENTS} | sed -E ' s/compiler-rt;//g' | sed -E ' s/;/ install-/g' )
2797
+ else
2798
+ INSTALL_TARGETS=install-$( echo ${LLVM_INSTALL_COMPONENTS} | sed -E ' s/;/ install-/g' )
2799
+ fi
2790
2800
fi
2791
2801
;;
2792
2802
libcxx)
0 commit comments