Separate build directory for libdispatch_static #19711
Conversation
utils/build-script-impl
Outdated
| @@ -2214,7 +2218,7 @@ for host in "${ALL_HOSTS[@]}"; do | |||
| -DSWIFT_PATH_TO_CMARK_SOURCE:PATH="${CMARK_SOURCE_DIR}" | |||
| -DSWIFT_PATH_TO_CMARK_BUILD:PATH="$(build_directory ${host} cmark)" | |||
| -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE:PATH="${LIBDISPATCH_SOURCE_DIR}" | |||
| -DSWIFT_PATH_TO_LIBDISPATCH_BUILD:PATH="$(build_directory ${host} libdispatch)" | |||
| -DSWIFT_PATH_TO_LIBDISPATCH_BUILD:PATH="$(build_directory ${host} sourcekit-libdispatch)" | |||
There was a problem hiding this comment.
This shouldn't be needed once #19674 is merged. We can just drop the entire option.
|
@swift-ci please smoke test |
|
@kevints - did you forget to upload the updated diff? |
|
@compnerd I was attempting to rebase the updated diff and ran into https://bugs.swift.org/browse/SR-8925 instead so I haven't been able to build it yet. |
kevints
force-pushed
the
libdispatch_static
branch
from
244839c to
c105da4
Compare
|
@swift-ci please test |
kevints
force-pushed
the
libdispatch_static
branch
from
c105da4 to
eb40500
Compare
| -DBUILD_SHARED_LIBS=NO | ||
| -DSWIFT_RUNTIME_LIBDIR:PATH="${SWIFT_BUILD_PATH}/lib/swift_static/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}" | ||
| -DINSTALL_TARGET_DIR:PATH=lib/swift_static/${target} | ||
| ) |
There was a problem hiding this comment.
Both SWIFT_RUNTIME_LIBDIR and INSTALL_TARGET_DIR should no longer be needed with #19834.
There was a problem hiding this comment.
Thanks [~compnerd], I'll take a look at this and rebase next week (unless this is blocking your work in which case feel free to take it over).
|
@kevints Are you still working on this one or are you happy for me to take it over? |
|
@spevans I’m happy for you to take it over. |
|
@kevints - this is way out of date, and the work is already done, no reason to keep it open. |
This change adds a separate build directory for libdispatch_static, which mirrors the configuration of libdispatch with BUILD_SHARED_LIBS=NO. It also creates a separate build directory sourcekit-libdispatch which is used by the swift build.
Resolves SR-8854.