Skip to content

Commit cf18196

Browse files
committed
---
yaml --- r: 346971 b: refs/heads/master c: 96c32f9 h: refs/heads/master i: 346969: c889f4f 346967: 1a22c8a
1 parent 2751b03 commit cf18196

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 37da95021fde604e5b8eef818e74147e3bb0291f
2+
refs/heads/master: 96c32f9ef8bbfa86722dc0c90ec4838a5a225dd7
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/docs/WindowsBuild.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -102,22 +102,7 @@ mklink "%VCToolsInstallDir%\include\visualc.apinotes" S:\swift\stdlib\public\Pla
102102

103103
Warning: Creating the above links usually requires administrator privileges. The quick and easy way to do this is to open a second developer prompt by right clicking whatever shortcut you used to open the first one, choosing Run As Administrator, and pasting the above commands into the resulting window. You can then close the privileged prompt; this is the only step which requires elevation.
104104

105-
### 5. Build CMark
106-
- This must be done from within a developer command prompt. CMark is a fairly
107-
small project and should only take a few minutes to build.
108-
```cmd
109-
mkdir "S:\b\cmark"
110-
pushd "S:\b\cmark"
111-
cmake -G Ninja^
112-
-DCMAKE_BUILD_TYPE=RelWithDebInfo^
113-
-DCMAKE_C_COMPILER=cl^
114-
-DCMAKE_CXX_COMPILER=cl^
115-
S:/cmark
116-
popd
117-
cmake --build "S:\b\cmark"
118-
```
119-
120-
### 6. Build LLVM/Clang
105+
### 5. Build LLVM/Clang
121106
- This must be done from within a developer command prompt. LLVM and Clang are
122107
large projects, so building might take a few hours. Make sure that the build
123108
type for LLVM/Clang is compatbile with the build type for Swift. That is,
@@ -146,6 +131,21 @@ cmake --build "S:\b\llvm"
146131
path S:\b\llvm\bin;%PATH%
147132
```
148133

134+
### 6. Build CMark
135+
- This must be done from within a developer command prompt. CMark is a fairly
136+
small project and should only take a few minutes to build.
137+
```cmd
138+
mkdir "S:\b\cmark"
139+
pushd "S:\b\cmark"
140+
cmake -G Ninja^
141+
-DCMAKE_BUILD_TYPE=RelWithDebInfo^
142+
-DCMAKE_C_COMPILER=cl^
143+
-DCMAKE_CXX_COMPILER=cl^
144+
S:\cmark
145+
popd
146+
cmake --build "S:\b\cmark"
147+
```
148+
149149
### 7. Build Swift
150150
- This must be done from within a developer command prompt
151151
- Note that Visual Studio vends a 32-bit python 2.7 installation in `C:\Python27` and a 64-bit python in `C:\Python27amd64`. You may use either one based on your installation.

0 commit comments

Comments
 (0)