Skip to content

Commit 1b966c8

Browse files
committed
Simplify configure pass for Foundation to use a defined variable for XCTest's build directory
1 parent 3d5c496 commit 1b966c8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Diff for: utils/build-script-impl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1696,7 +1696,7 @@ for deployment_target in "${NATIVE_TOOLS_DEPLOYMENT_TARGETS[@]}" "${CROSS_TOOLS_
16961696
set -x
16971697
pushd "${FOUNDATION_SOURCE_DIR}"
16981698
SWIFTC="${SWIFTC_BIN}" CLANG="${LLVM_BIN}"/clang SWIFT="${SWIFT_BIN}" \
1699-
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}"
1699+
SDKROOT="${SWIFT_BUILD_PATH}" BUILD_DIR="${build_dir}" DSTROOT="${INSTALL_DESTDIR}" PREFIX="${INSTALL_PREFIX}" ./configure "${FOUNDATION_BUILD_TYPE}" -DXCTEST_BUILD_DIR=${XCTEST_BUILD_DIR}
17001700
$NINJA_BIN
17011701
popd
17021702
{ set +x; } 2>/dev/null

0 commit comments

Comments
 (0)