Skip to content

utils: Remove obsolete CMake arguments #83469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
compnerd merged 1 commit into from
Aug 1, 2025
Merged

utils: Remove obsolete CMake arguments #83469

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 7 additions & 17 deletions utils/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,12 +1438,7 @@ function Build-CMakeProject {
}

Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER $SWIFTC
if ($UsePinnedCompilers.Contains("Swift")) {
# TODO(compnerd): remove this once we bump to a newer pinned toolchain.
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET $Platform.Triple
} else {
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET (Get-ModuleTriple $Platform)
}
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET (Get-ModuleTriple $Platform)

# TODO(compnerd): remove this once we have the early swift-driver
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_USE_OLD_DRIVER "YES"
Expand Down Expand Up @@ -1512,8 +1507,6 @@ function Build-CMakeProject {

if ($UseC) {
Add-KeyValueIfNew $Defines CMAKE_C_COMPILER_TARGET $Platform.Triple
# FIXME(compnerd) why is this needed?
Add-KeyValueIfNew $Defines CMAKE_C_COMPILER_WORKS YES

$CFLAGS = @("--sysroot=${AndroidSysroot}")
if ($DebugInfo -and ($CDebugFormat -eq "dwarf")) {
Expand All @@ -1524,8 +1517,6 @@ function Build-CMakeProject {

if ($UseCXX) {
Add-KeyValueIfNew $Defines CMAKE_CXX_COMPILER_TARGET $Platform.Triple
# FIXME(compnerd) why is this needed?
Add-KeyValueIfNew $Defines CMAKE_CXX_COMPILER_WORKS YES

$CXXFLAGS = @("--sysroot=${AndroidSysroot}")
if ($DebugInfo -and ($CDebugFormat -eq "dwarf")) {
Expand All @@ -1547,13 +1538,8 @@ function Build-CMakeProject {
Join-Path -Path (Get-PinnedToolchainToolsDir) -ChildPath "swiftc.exe"
}
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER $SWIFTC
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET (Get-ModuleTriple $Platform)

# TODO(compnerd) remove this once we bump to a newer pinned toolchain
if ($UsePinnedCompilers.Contains("Swift")) {
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET $Platform.Triple
} else {
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET (Get-ModuleTriple $Platform)
}
# TODO(compnerd) remove this once we have the early swift-driver
Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_USE_OLD_DRIVER "YES"

Expand All @@ -1579,7 +1565,11 @@ function Build-CMakeProject {
Add-FlagsDefine $Defines CMAKE_Swift_FLAGS_RELWITHDEBINFO "-O"
}

if ($UseASM -or $UseC -or $UseCXX) {
$UseBuiltASMCompiler = $UseBuiltCompilers.Contains("ASM")
$UseBuiltCCompiler = $UseBuiltCompilers.Contains("C")
$UseBuiltCXXCompiler = $UseBuiltCompilers.Contains("CXX")

if ($UseBuiltASMCompiler -or $UseBuiltCCompiler -or $UseBuiltCXXCompiler) {
# Use a built lld linker as the Android's NDK linker might be too old
# and not support all required relocations needed by the Swift
# runtime.
Expand Down