Skip to content

Commit ae3dc8d

Browse files
committed
Merge pull request #8 from phausler/FoundationConfigureSimplification
Simplify configure pass for Foundation to use a defined variable for XCTest's build directory
2 parents 872b8ac + 1b966c8 commit ae3dc8d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

utils/build-script-impl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1711,7 +1711,7 @@ for deployment_target in "${NATIVE_TOOLS_DEPLOYMENT_TARGETS[@]}" "${CROSS_TOOLS_
17111711
set -x
17121712
pushd "${FOUNDATION_SOURCE_DIR}"
17131713
SWIFTC="${SWIFTC_BIN}" CLANG="${LLVM_BIN}"/clang SWIFT="${SWIFT_BIN}" \
1714-
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}"
1714+
SDKROOT="${SWIFT_BUILD_PATH}" BUILD_DIR="${build_dir}" DSTROOT="${INSTALL_DESTDIR}" PREFIX="${INSTALL_PREFIX}" ./configure "${FOUNDATION_BUILD_TYPE}" -DXCTEST_BUILD_DIR=${XCTEST_BUILD_DIR}
17151715
$NINJA_BIN
17161716
popd
17171717
{ set +x; } 2>/dev/null

0 commit comments

Comments
 (0)