From ab56873dd5288303fde8e8c98fd3f0cc0ff3e6a8 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Mon, 24 Sep 2018 14:50:46 -0700 Subject: [PATCH] build-script: always rebuild XCTest on non-Darwin This should resolve SR-8826! Ideally, we would be using CMake to tie together all the dependent packages and get proper dependency tracking. Currently, change to the swift runtime do not get tracked properly, and can result in undefined references to symbols. --- utils/build-script-impl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/build-script-impl b/utils/build-script-impl index 9504c526d4023..b5f2222c67d1d 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -2487,6 +2487,11 @@ for host in "${ALL_HOSTS[@]}"; do continue ;; *) + # FIXME: Always re-build XCTest on non-darwin platforms. + # Remove this when products build in the CMake system. + echo "Cleaning the XCTest build directory" + call rm -rf "${XCTEST_BUILD_DIR}" + cmake_options=( ${cmake_options[@]} -DCMAKE_BUILD_TYPE:STRING="${LIBDISPATCH_BUILD_TYPE}"