Skip to content

Commit 800850d

Browse files
committed
Fix trunk libdispatch modules generated
1 parent 13c1c18 commit 800850d

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

swift-android-trunk-libdispatch.patch

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
diff --git a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake b/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake
2+
index 3da519e..e2dd8ed 100644
3+
--- a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake
4+
+++ b/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake
5+
@@ -4,6 +4,10 @@ if(NOT dispatch_MODULE_TRIPLE)
6+
set(module_triple_command "${CMAKE_Swift_COMPILER}" -print-target-info)
7+
if(CMAKE_Swift_COMPILER_TARGET)
8+
list(APPEND module_triple_command -target ${CMAKE_Swift_COMPILER_TARGET})
9+
+ else()
10+
+ set(arg_list ${CMAKE_Swift_FLAGS})
11+
+ separate_arguments(arg_list)
12+
+ list(APPEND module_triple_command ${arg_list})
13+
endif()
14+
execute_process(COMMAND ${module_triple_command} OUTPUT_VARIABLE target_info_json)
15+
116
diff --git a/swift-corelibs-libdispatch/src/swift/CMakeLists.txt b/swift-corelibs-libdispatch/src/swift/CMakeLists.txt
217
index 38bef37..d0ddf98 100644
318
--- a/swift-corelibs-libdispatch/src/swift/CMakeLists.txt

0 commit comments

Comments
 (0)