Skip to content

Commit 01547a6

Browse files
authored
Merge pull request swiftlang#33887 from stevapple/windows-build-fix
[docs] Fix WindowsBuild.md
2 parents a61e704 + 0e68e4d commit 01547a6

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

docs/WindowsBuild.md

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ From the settings application, go to `Update & Security`. In the `For developer
4343

4444
## Clone the repositories
4545

46-
1. Clone `apple/llvm-project` into a directory for the toolchain
47-
2. Clone `apple/swift-cmark`, `apple/swift`, `apple/swift-corelibs-libdispatch`, `apple/swift-corelibs-foundation`, `apple/swift-corelibs-xctest`, `apple/swift-llbuild`, `apple/swift-package-manager` into the toolchain directory
46+
1. Clone `swift/master` branch of `apple/llvm-project` into the build workspace
47+
2. Clone `apple/swift-cmark`, `apple/swift`, `apple/swift-corelibs-libdispatch`, `apple/swift-corelibs-foundation`, `apple/swift-corelibs-xctest`, `apple/swift-tools-support-core`, `apple/swift-llbuild`, `apple/swift-argument-parser`, `apple/swift-driver`, `apple/swift-package-manager`, `JPSim/Yams`, `apple/indexstore-db` into the build workspace
4848

4949
- Currently, other repositories in the Swift project have not been tested and may not be supported.
5050

@@ -310,12 +310,12 @@ cmake -B S:\b\7 ^
310310
-D Foundation_DIR=S:\b\3\cmake\modules ^
311311
-D XCTest_DIR=S:\b\4\cmake\modules ^
312312
-G Ninja ^
313-
-S S:\swift-llbuild
313+
-S S:\Yams
314314
315315
ninja -C S:\b\7
316316
```
317317

318-
## Build swift-driver
318+
## Build swift-argument-parser
319319

320320
```cmd
321321
cmake -B S:\b\8 ^
@@ -325,16 +325,14 @@ cmake -B S:\b\8 ^
325325
-D CMAKE_Swift_COMPILER=S:/b/1/bin/swiftc.exe ^
326326
-D dispatch_DIR=S:\b\2\cmake\modules ^
327327
-D Foundation_DIR=S:\b\3\cmake\modules ^
328-
-D TSC_DIR=S:\b\5\cmake\modules ^
329-
-D LLBuild_DIR=S:\b\6\cmake\modules ^
330-
-D Yams_DIR=S:\b\7\cmake\modules ^
328+
-D XCTest_DIR=S:\b\4\cmake\modules ^
331329
-G Ninja ^
332-
-S S:\swift-driver
330+
-S S:\swift-argument-parser
333331
334332
ninja -C S:\b\8
335333
```
336334

337-
## Build swift-argument-parser
335+
## Build swift-driver
338336

339337
```cmd
340338
cmake -B S:\b\9 ^
@@ -344,9 +342,12 @@ cmake -B S:\b\9 ^
344342
-D CMAKE_Swift_COMPILER=S:/b/1/bin/swiftc.exe ^
345343
-D dispatch_DIR=S:\b\2\cmake\modules ^
346344
-D Foundation_DIR=S:\b\3\cmake\modules ^
347-
-D XCTest_DIR=S:\b\4\cmake\modules ^
345+
-D TSC_DIR=S:\b\5\cmake\modules ^
346+
-D LLBuild_DIR=S:\b\6\cmake\modules ^
347+
-D Yams_DIR=S:\b\7\cmake\modules ^
348+
-D ArgumentParser_DIR=S:\b\8\cmake\modules ^
348349
-G Ninja ^
349-
-S S:\swift-argument-parser
350+
-S S:\swift-driver
350351
351352
ninja -C S:\b\9
352353
```
@@ -365,8 +366,8 @@ cmake -B S:\b\10 ^
365366
-D TSC_DIR=S:\b\5\cmake\modules ^
366367
-D LLBuild_DIR=S:\b\6\cmake\modules ^
367368
-D Yams_DIR=S:\b\7\cmake\modules ^
368-
-D SwiftDriver_DIR=S:\b\8\cmake\modules ^
369-
-D ArgumentParser_DIR=S:\b\9\cmake\modules ^
369+
-D ArgumentParser_DIR=S:\b\8\cmake\modules ^
370+
-D SwiftDriver_DIR=S:\b\9\cmake\modules ^
370371
-G Ninja ^
371372
-S S:\swift-package-manager
372373
@@ -383,7 +384,7 @@ set SWIFTPM_PD_LIBS=S:\b\10\pm
383384
- Run ninja install:
384385

385386
```cmd
386-
ninja -C S:\b\toolchain install
387+
ninja -C S:\b\1 install
387388
```
388389

389390
- Add the Swift on Windows binaries path (`C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin`) to the `PATH` environment variable.

0 commit comments

Comments
 (0)