From 782578b2fcdc152be71d72a6695d798332086814 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Thu, 11 Oct 2018 12:35:54 -0700 Subject: [PATCH] build: use the exported config for libdispatch Pass along the configuration through the exported target for the standard library. Still pass the compiler by hand to allow building libdispatch against just a build of the standard library. (cherry picked from commit b99a0f4af5e30861a117a6f7c93b82d8a95f3497) --- utils/build-script-impl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/build-script-impl b/utils/build-script-impl index 80e33881f4e7e..e390c50d358c1 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -2628,7 +2628,7 @@ for host in "${ALL_HOSTS[@]}"; do -DCMAKE_INSTALL_LIBDIR:PATH="lib" -DENABLE_SWIFT=YES - -DSWIFT_RUNTIME_LIBDIR:PATH="${SWIFT_BUILD_PATH}/lib/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}" + -DSwift_DIR="${SWIFT_BUILD_PATH}/lib/cmake/swift" -DENABLE_TESTING=YES )