Skip to content

Commit 27fbd5a

Browse files
committed
Provide source dirs to Foundations build for dependencies
1 parent 7ce7147 commit 27fbd5a

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

utils/build-script-impl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,10 +1236,13 @@ STRESSTEST_PACKAGE_DIR="${WORKSPACE}/swift-stress-tester"
12361236
XCTEST_SOURCE_DIR="${WORKSPACE}/swift-corelibs-xctest"
12371237
FOUNDATION_SOURCE_DIR="${WORKSPACE}/swift-corelibs-foundation"
12381238
FOUNDATION_STATIC_SOURCE_DIR="${WORKSPACE}/swift-corelibs-foundation"
1239+
FOUNDATION_SWIFTFOUNDATION_SOURCE_DIR="${WORKSPACE}/swift-foundation"
1240+
FOUNDATION_SWIFTFOUNDATIONICU_SOURCE_DIR="${WORKSPACE}/swift-foundation-icu"
12391241
LIBDISPATCH_SOURCE_DIR="${WORKSPACE}/swift-corelibs-libdispatch"
12401242
LIBDISPATCH_STATIC_SOURCE_DIR="${WORKSPACE}/swift-corelibs-libdispatch"
12411243
LIBICU_SOURCE_DIR="${WORKSPACE}/icu"
12421244
LIBCXX_SOURCE_DIR="${WORKSPACE}/llvm-project/runtimes"
1245+
SWIFT_COLLECTIONS_SOURCE_DIR="${WORKSPACE}/swift-collections"
12431246
SWIFT_PATH_TO_STRING_PROCESSING_SOURCE="${WORKSPACE}/swift-experimental-string-processing"
12441247
SWIFTSYNTAX_SOURCE_DIR="${WORKSPACE}/swift-syntax"
12451248
SWIFT_SYNTAX_SOURCE_DIR="${WORKSPACE}/swift-syntax"
@@ -2519,6 +2522,10 @@ for host in "${ALL_HOSTS[@]}"; do
25192522
-DFOUNDATION_PATH_TO_LIBDISPATCH_BUILD=$(build_directory ${host} libdispatch)
25202523
-Ddispatch_DIR=$(build_directory ${host} libdispatch)/cmake/modules
25212524

2525+
-D_SwiftFoundation_SourceDIR=${FOUNDATION_SWIFTFOUNDATION_SOURCE_DIR}
2526+
-D_SwiftFoundationICU_SourceDIR=${FOUNDATION_SWIFTFOUNDATIONICU_SOURCE_DIR}
2527+
-D_SwiftCollections_SourceDIR=${SWIFT_COLLECTIONS_SOURCE_DIR}
2528+
25222529
# NOTE(compnerd) we disable tests because XCTest is not ready
25232530
# yet, but we will reconfigure when the time comes.
25242531
-DENABLE_TESTING:BOOL=NO

0 commit comments

Comments
 (0)