Skip to content

Commit 63a65a0

Browse files
committed
Remove upstreamed trunk patch from CI
1 parent 54a5d57 commit 63a65a0

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

swift-android-trunk-libdispatch.patch

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,3 @@
1-
diff --git a/swift/utils/build-script-impl b/swift/utils/build-script-impl
2-
index 890fc5e1419..a9bdd7f8842 100755
3-
--- a/swift/utils/build-script-impl
4-
+++ b/swift/utils/build-script-impl
5-
@@ -2331,7 +2331,7 @@ for host in "${ALL_HOSTS[@]}"; do
6-
continue
7-
fi
8-
9-
- if [[ "${BUILD_SWIFT_TOOLS}" == "0" ]]; then
10-
+ if [[ "${CROSS_COMPILE_BUILD_SWIFT_TOOLS}" == "0" ]]; then
11-
echo "Skipping building Foundation Macros for ${host}, because the host tools are not being built"
12-
continue
13-
fi
14-
@@ -2920,7 +2920,7 @@ for host in "${ALL_HOSTS[@]}"; do
15-
continue
16-
fi
17-
18-
- if [[ "${BUILD_SWIFT_TOOLS}" == "0" && "${product}" == "foundation_macros" ]]; then
19-
+ if [[ "${CROSS_COMPILE_BUILD_SWIFT_TOOLS}" == "0" && "${product}" == "foundation_macros" ]]; then
20-
echo "Skipping installing Foundation Macros for ${host}, because the host tools are not being built"
21-
continue
22-
fi
231
diff --git a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake b/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake
242
index 3da519e..e2dd8ed 100644
253
--- a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake

0 commit comments

Comments
 (0)