Skip to content

Commit fdb1f93

Browse files
authored
Merge pull request #83852 from compnerd/android
build.ps1: add a workaround for Android build break
2 parents 2640584 + 3224bb4 commit fdb1f93

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

utils/build.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1680,6 +1680,11 @@ function Build-CMakeProject {
16801680
"-Xclang-linker", "-resource-dir", "-Xclang-linker", "${AndroidPrebuiltRoot}\lib\clang\$($(Get-AndroidNDK).ClangVersion)"
16811681
)
16821682

1683+
# FIXME(compnerd) remove this once we have the early swift-driver
1684+
if ($SwiftSDK) {
1685+
$SwiftFlags += @("-Xclang-linker", "-L", "-Xclang-linker", [IO.Path]::Combine($SwiftSDK, "usr", "lib", "swift", "android", $Platform.Architecture.LLVMName))
1686+
}
1687+
16831688
$SwiftFlags += if ($DebugInfo) { @("-g") } else { @("-gnone") }
16841689

16851690
Add-FlagsDefine $Defines CMAKE_Swift_FLAGS $SwiftFlags

0 commit comments

Comments
 (0)