Skip to content

Commit dba3498

Browse files
authored
Merge pull request #70587 from compnerd/linker
build: remove `-DefaultsLLD` option for build.ps1
2 parents 4f185db + 9a19aec commit dba3498

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

utils/build.ps1

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@ If set, does not run the build phase.
5656
.PARAMETER SkipPackaging
5757
If set, skips building the msi's and installer
5858
59-
.PARAMETER DefaultsLLD
60-
If false, use `link.exe` as the default linker with the SDK (with SPM)
61-
6259
.PARAMETER DebugInfo
6360
If set, debug information will be generated for the builds.
6461
@@ -101,7 +98,6 @@ param(
10198
[switch] $SkipBuild = $false,
10299
[switch] $SkipRedistInstall = $false,
103100
[switch] $SkipPackaging = $false,
104-
[bool] $DefaultsLLD = $true,
105101
[string[]] $Test = @(),
106102
[string] $Stage = "",
107103
[string] $BuildTo = "",
@@ -1274,13 +1270,8 @@ function Build-XCTest($Arch, [switch]$Test = $false) {
12741270
Foundation_DIR = "$FoundationBinaryCache\cmake\modules";
12751271
} + $TestingDefines)
12761272

1277-
if ($DefaultsLLD) {
1278-
Invoke-Program $python -c "import plistlib; print(str(plistlib.dumps({ 'DefaultProperties': { 'XCTEST_VERSION': 'development', 'SWIFTC_FLAGS': ['-use-ld=lld'] } }), encoding='utf-8'))" `
1279-
-OutFile "$($Arch.PlatformInstallRoot)\Info.plist"
1280-
} else {
1281-
Invoke-Program $python -c "import plistlib; print(str(plistlib.dumps({ 'DefaultProperties': { 'XCTEST_VERSION': 'development' } }), encoding='utf-8'))" `
1282-
-OutFile "$($Arch.PlatformInstallRoot)\Info.plist"
1283-
}
1273+
Invoke-Program $python -c "import plistlib; print(str(plistlib.dumps({ 'DefaultProperties': { 'XCTEST_VERSION': 'development', 'SWIFTC_FLAGS': ['-use-ld=lld'] } }), encoding='utf-8'))" `
1274+
-OutFile "$($Arch.PlatformInstallRoot)\Info.plist"
12841275
}
12851276
}
12861277

0 commit comments

Comments
 (0)