Skip to content

Commit a5b7776

Browse files
committed
docs/Windows: Add disclaimer about llvm_bin_dir & fixup LLVM paths
1 parent 9edc07c commit a5b7776

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

docs/WindowsBuild.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,14 @@ cmake -G "Ninja"^
115115
-DLLVM_TARGETS_TO_BUILD=X86^
116116
"%swift_source_dir%/llvm"
117117
popd
118-
cmake --build "%swift_source_dir%/build/Ninja-DebugAssert/llvm-windows-amd64"
118+
cmake --build "%swift_source_dir%/build/Ninja-RelWithDebInfoAssert/llvm-windows-amd64"
119119
```
120-
- store the llvm `bin` directory in an environment variable so it can be used to build swift
120+
- store the llvm `bin` directory in an environment variable so it can be used
121+
to build swift. Assuming you followed the instructions exactly, the path
122+
below is correct, but it may be different based on your build variant and
123+
platform, so double check.
121124
```cmd
122-
set llvm_bin_dir="%swift_source_dir%/build/Ninja-DebugAssert/llvm-windows-amd64/bin"
125+
set llvm_bin_dir="%swift_source_dir%/build/Ninja-RelWithDebInfoAssert/llvm-windows-amd64/bin"
123126
```
124127

125128
### 7. Build Swift
@@ -179,8 +182,8 @@ pushd "%swift_source_dir%/build/Ninja-DebugAssert/swift-windows-amd64"
179182
cmake -G "Ninja" "%swift_source_dir%/swift"^
180183
-DCMAKE_BUILD_TYPE=Debug^
181184
-DSWIFT_PATH_TO_CMARK_SOURCE="%swift_source_dir%/cmark"^
182-
-DSWIFT_PATH_TO_CMARK_BUILD="%swift_source_dir%/build/Ninja-DebugAssert/cmark-windows-amd64"^
183-
-DSWIFT_CMARK_LIBRARY_DIR="%swift_source_dir%/build/Ninja-DebugAssert/cmark-windows-amd64/src"^
185+
-DSWIFT_PATH_TO_CMARK_BUILD="%swift_source_dir%/build/Ninja-RelWithDebInfoAssert/cmark-windows-amd64"^
186+
-DSWIFT_CMARK_LIBRARY_DIR="%swift_source_dir%/build/Ninja-RelWithDebInfoAssert/cmark-windows-amd64/src"^
184187
-DSWIFT_PATH_TO_LLVM_SOURCE="%swift_source_dir%/llvm"^
185188
-DSWIFT_PATH_TO_LLVM_BUILD="%swift_source_dir%/build/Ninja-RelWithDebInfoAssert/llvm-windows-amd64"^
186189
-DSWIFT_PATH_TO_CLANG_SOURCE="%swift_source_dir%/llvm/tools/clang"^

0 commit comments

Comments
 (0)