Skip to content

Commit c90571b

Browse files
tristanlabellecompnerd
authored andcommitted
Leverage CMAKE_INSTALL_BINDIR for XCTest
1 parent f0fee04 commit c90571b

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

build.ps1

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -637,19 +637,13 @@ function Build-XCTest($Arch)
637637
-UseBuiltCompilers Swift `
638638
-BuildDefaultTarget `
639639
-Defines @{
640+
CMAKE_INSTALL_BINDIR = $Arch.BinaryDir;
640641
CMAKE_SYSTEM_NAME = "Windows";
641642
CMAKE_SYSTEM_PROCESSOR = $Arch.CMakeName;
642643
dispatch_DIR = "$DispatchBinDir\cmake\modules";
643644
Foundation_DIR = "$FoundationBinDir\cmake\modules";
644645
}
645646

646-
# Restructure Runtime
647-
Remove-Item -Recurse -Force -ErrorAction Ignore `
648-
$InstallDir\$($Arch.BinaryDir)
649-
Move-Item -Force `
650-
$InstallDir\bin `
651-
$InstallDir\$($Arch.BinaryDir)
652-
653647
# Restructure Import Libraries
654648
New-Item -ErrorAction Ignore -Type Directory `
655649
-Path $InstallDir\lib\swift\windows\$($Arch.LLVMName)

0 commit comments

Comments
 (0)