Skip to content

Next step in connecting libdispatch and foundation builds #1212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 11, 2016
Merged

Next step in connecting libdispatch and foundation builds #1212

merged 1 commit into from
Feb 11, 2016

Conversation

dgrove-oss
Copy link
Contributor

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

@@ -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-sdk="${SWIFT_BUILD_PATH}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"SDK" seems to be the wrong way to call the build directory. It is usually called the "toolchain". The SDK is the directory with the headers and frameworks.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok. thanks. I didn't know that. I'll make the change here and in the corresponding pull request to libdispatch.

@gribozavr
Copy link
Contributor

LGTM modulo the SDK comment.

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
@dgrove-oss
Copy link
Contributor Author

changed to --with-swift-toolchain & squashed

@gribozavr
Copy link
Contributor

@swift-ci Please test

1 similar comment
@gribozavr
Copy link
Contributor

@swift-ci Please test

@modocache
Copy link
Contributor

Awesome work, @dgrove-oss. Very excited to see this happen.

On a related note, I'm expecting to make a similar change soon that establishes a dependency between XCTest and Foundation. The pull request that will introduce the dependency is swiftlang/swift-corelibs-xctest#43, the corresponding change to the build script is modocache@a17c05b. Just a heads up!

@drewcrawford
Copy link
Contributor

LGTM. I'm currently cherry-picking this commit into my binaries.

This is amazing, SO excited to have dispatch on Linux.

@dgrove-oss
Copy link
Contributor Author

@gribozavr. Hi, just pinging to see if this could be merged. Looks like CI tests passed. Thanks!

gribozavr added a commit that referenced this pull request Feb 11, 2016
Next step in connecting libdispatch and foundation builds
@gribozavr gribozavr merged commit a27bea0 into swiftlang:master Feb 11, 2016
@gribozavr
Copy link
Contributor

@dgrove-oss Sorry for the delay!

@dgrove-oss dgrove-oss deleted the libdispatch_build_plumbing branch February 16, 2016 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants