Skip to content

Commit fca38b9

Browse files
authored
Merge pull request swiftlang#21618 from apple/windows-builds-are-hard
2 parents 16eda3a + 865ab20 commit fca38b9

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

docs/WindowsBuild.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ VsDevCmd -arch=x86
9191
mklink %UniversalCRTSdkDir%\Include\%UCRTVersion%\ucrt\module.modulemap S:\swift\stdlib\public\Platform\ucrt.modulemap
9292
mklink %VCToolsInstallDir%\include\module.modulemap S:\swift\stdlib\public\Platform\visualc.modulemap
9393
mklink %VCToolsInstallDir%\include\visualc.apinotes S:\swift\stdlib\public\Platform\visualc.apinotes
94-
mklink %UniversalCRTSdkDir\Include\%UCRTVersion%\um\module.modulemap S:\swift\stdlib\public\Platform\winsdk.modulemap
94+
mklink %UniversalCRTSdkDir%\Include\%UCRTVersion%\um\module.modulemap S:\swift\stdlib\public\Platform\winsdk.modulemap
9595
```
9696

9797
### 5. Build CMark
@@ -257,14 +257,13 @@ cmake -G "Ninja"^
257257
### 12. Install Swift on Windows
258258

259259
- Run ninja install:
260+
260261
```cmd
261262
ninja -C "S:/build/Ninja-DebugAssert/swift-windows-amd64" install
262263
```
263-
- Add the Swift on Windows binaries path (`C:\Program Files (x86)\Swift\bin`) to the
264-
`Path` environment variable.
265-
- Add the Swift on Windows library path (`C:\Program Files (x86)\Swift\lib\swift\windows`)
266-
to the `Path` environment variable.
264+
265+
- Add the Swift on Windows binaries path (`C:\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin`) to the `PATH` environment variable.
267266

268267
## MSVC
269268

270-
To use `cl` instead, just remove the `-DCMAKE_C_COMPILER` and `-DCMAKE_CXX_COMPILER` parameters to the `cmake` invocations.
269+
To use `cl` instead, just replace the `-DCMAKE_C_COMPILER` and `-DCMAKE_CXX_COMPILER` parameters to the `cmake` invocations.

0 commit comments

Comments
 (0)