Commit 9f7192f8 authored by Drew's avatar Drew

Remove libdispatch patches that are no longer necessary

parent 43b7025c
This diff is collapsed.
From 05d4aa0ba616e7b0c92642dc50df3d65e2d4ba08 Mon Sep 17 00:00:00 2001
From: David Grove <groved@us.ibm.com>
Date: Fri, 5 Feb 2016 19:38:21 +0000
Subject: [PATCH] Next step in connecting libdispatch and foundation builds
Three small changes for building libdispatch and foundation together.
(1) Put libdispatch into PRODUCTS before foundation
(2) Pass path to swift down into libdispatch build
(3) Pass paths to libdispatch down into foundation build
---
utils/build-script-impl | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/utils/build-script-impl b/utils/build-script-impl
index 3e71cbb..e49abfc 100755
--- a/utils/build-script-impl
+++ b/utils/build-script-impl
@@ -926,12 +926,12 @@ fi
if [[ ! "${SKIP_BUILD_XCTEST}" ]] ; then
PRODUCTS=("${PRODUCTS[@]}" xctest)
fi
-if [[ ! "${SKIP_BUILD_FOUNDATION}" ]] ; then
- PRODUCTS=("${PRODUCTS[@]}" foundation)
-fi
if [[ ! "${SKIP_BUILD_LIBDISPATCH}" ]] ; then
PRODUCTS=("${PRODUCTS[@]}" libdispatch)
fi
+if [[ ! "${SKIP_BUILD_FOUNDATION}" ]] ; then
+ PRODUCTS=("${PRODUCTS[@]}" foundation)
+fi
SWIFT_STDLIB_TARGETS=()
SWIFT_PERFTEST_TARGETS=()
@@ -1801,6 +1801,12 @@ for deployment_target in "${HOST_TARGET}" "${CROSS_TOOLS_DEPLOYMENT_TARGETS[@]}"
LLVM_BIN="$(build_directory_bin ${deployment_target} llvm)"
NINJA_BIN="ninja"
+ # Staging: require opt-in for building with dispatch
+ if [[ ! "${SKIP_BUILD_LIBDISPATCH}" ]] ; then
+ LIBDISPATCH_BUILD_DIR="$(build_directory ${deployment_target} libdispatch)"
+ LIBDISPATCH_BUILD_ARGS="-DLIBDISPATCH_SOURCE_DIR=${LIBDISPATCH_SOURCE_DIR} -DLIBDISPATCH_BUILD_DIR=${LIBDISPATCH_BUILD_DIR}"
+ fi
+
if [[ "${BUILD_NINJA}" ]]; then
NINJA_BUILD_DIR=$(build_directory build ninja)
NINJA_BIN="${NINJA_BUILD_DIR}/ninja"
@@ -1809,7 +1815,7 @@ for deployment_target in "${HOST_TARGET}" "${CROSS_TOOLS_DEPLOYMENT_TARGETS[@]}"
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}" ./configure "${FOUNDATION_BUILD_TYPE}" -DXCTEST_BUILD_DIR=${XCTEST_BUILD_DIR}
+ SDKROOT="${SWIFT_BUILD_PATH}" BUILD_DIR="${build_dir}" DSTROOT="${INSTALL_DESTDIR}" PREFIX="${INSTALL_PREFIX}" ./configure "${FOUNDATION_BUILD_TYPE}" -DXCTEST_BUILD_DIR=${XCTEST_BUILD_DIR} $LIBDISPATCH_BUILD_ARGS
${NINJA_BIN}
popd
{ set +x; } 2>/dev/null
@@ -1819,6 +1825,7 @@ for deployment_target in "${HOST_TARGET}" "${CROSS_TOOLS_DEPLOYMENT_TARGETS[@]}"
;;
libdispatch)
LIBDISPATCH_BUILD_DIR=$(build_directory ${deployment_target} ${product})
+ SWIFT_BUILD_PATH="$(build_directory ${deployment_target} swift)"
set -x
if [[ ! -f "${LIBDISPATCH_BUILD_DIR}"/config.status ]]; then
@@ -1828,7 +1835,7 @@ for deployment_target in "${HOST_TARGET}" "${CROSS_TOOLS_DEPLOYMENT_TARGETS[@]}"
autoreconf -fvi
popd
pushd "${LIBDISPATCH_BUILD_DIR}"
- "${LIBDISPATCH_SOURCE_DIR}"/configure --prefix="${INSTALL_DESTDIR}"/"${INSTALL_PREFIX}"
+ "${LIBDISPATCH_SOURCE_DIR}"/configure --prefix="${INSTALL_DESTDIR}"/"${INSTALL_PREFIX}" --with-swift-toolchain="${SWIFT_BUILD_PATH}"
popd
fi
pushd "${LIBDISPATCH_BUILD_DIR}"
--
2.5.4 (Apple Git-61)
......@@ -29,11 +29,11 @@ ADD update-tags.sh /swift-dev/update-tags.sh
RUN bash /swift-dev/update-tags.sh
# Apply patches here
ADD LIBDISPATCH_PR_43.patch /swift-dev/
ADD SWIFT_PR_1212.patch /swift-dev/
# RUN cd ../swift-corelibs-libdispatch && git apply < ../LIBDISPATCH_PR_43.patch
RUN git config --global user.email "drew@sealedabstract.com" && git config --global user.name "Drew Crawford"
RUN git am -3 < ../SWIFT_PR_1212.patch
# ADD SAMPLE.patch /swift-dev/
# RUN cd ../swift-corelibs-libdispatch && git apply < ../SAMPLE.patch
# or for AM
# RUN git config --global user.email "drew@sealedabstract.com" && git config --global user.name "Drew Crawford"
# RUN git am -3 < ../SAMPLE.patch
# And now we build, like a good little linuxen.
# I believe this is what the linux build script does. In practice, this builds a system into /tmp/install and then tars it up.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment