From 1b966c8e9cb9e6cf5f30a9577a4512fc3fb164f2 Mon Sep 17 00:00:00 2001
From: Philippe Hausler <phausler@apple.com>
Date: Fri, 20 Nov 2015 14:25:02 -0800
Subject: [PATCH] Simplify configure pass for Foundation to use a defined
 variable for XCTest's build directory

---
 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 ba1bdb138a299..9c1b0095eb32d 100755
--- a/utils/build-script-impl
+++ b/utils/build-script-impl
@@ -1696,7 +1696,7 @@ for deployment_target in "${NATIVE_TOOLS_DEPLOYMENT_TARGETS[@]}" "${CROSS_TOOLS_
                 set -x
                 pushd "${FOUNDATION_SOURCE_DIR}"
                 SWIFTC="${SWIFTC_BIN}" CLANG="${LLVM_BIN}"/clang SWIFT="${SWIFT_BIN}" \
-                      SDKROOT="${SWIFT_BUILD_PATH}" BUILD_DIR="${build_dir}" DSTROOT="${INSTALL_DESTDIR}" PREFIX="${INSTALL_PREFIX}" SWIFTCFLAGS="-I${XCTEST_BUILD_DIR}" LDFLAGS="-L${XCTEST_BUILD_DIR}" ./configure "${FOUNDATION_BUILD_TYPE}"
+                      SDKROOT="${SWIFT_BUILD_PATH}" BUILD_DIR="${build_dir}" DSTROOT="${INSTALL_DESTDIR}" PREFIX="${INSTALL_PREFIX}" ./configure "${FOUNDATION_BUILD_TYPE}" -DXCTEST_BUILD_DIR=${XCTEST_BUILD_DIR}
                 $NINJA_BIN
                 popd
                 { set +x; } 2>/dev/null