Skip to content

Commit 4169c8d

Browse files
authored
Merge pull request #500 from compnerd/windows-android
Windows Android cross-compilation build support
2 parents 52bc6b2 + 05a60ba commit 4169c8d

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

cmake/modules/SwiftSupport.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function(add_swift_target target)
99
cmake_parse_arguments(AST "${options}" "${single_value_options}" "${multiple_value_options}" ${ARGN})
1010

1111
set(compile_flags ${CMAKE_SWIFT_FLAGS})
12-
set(link_flags)
12+
set(link_flags ${CMAKE_SWIFT_LINK_FLAGS})
1313

1414
if(AST_TARGET)
1515
list(APPEND compile_flags -target;${AST_TARGET})

src/CMakeLists.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,17 @@ if(ENABLE_SWIFT)
116116
POSITION_INDEPENDENT_CODE YES)
117117

118118
if(USE_LLD_LINKER)
119-
set(use_ld_flag -use-ld=lld)
119+
if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
120+
set(use_ld_flag -use-ld=lld.exe)
121+
else()
122+
set(use_ld_flag -use-ld=lld)
123+
endif()
120124
elseif(USE_GOLD_LINKER)
121-
set(use_ld_flag -use-ld=gold)
125+
if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
126+
set(use_ld_flag -use-ld=gold.exe)
127+
else()
128+
set(use_ld_flag -use-ld=gold)
129+
endif()
122130
endif()
123131

124132
add_swift_library(swiftDispatch

0 commit comments

Comments
 (0)