Skip to content

Commit f3b0021

Browse files
committed
---
yaml --- r: 346991 b: refs/heads/master c: ee03b64 h: refs/heads/master i: 346989: 73decbf 346987: 46e4ab0 346983: df3aa02 346975: 29bdb8e
1 parent 0123b15 commit f3b0021

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
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: 9c58f740eb0454af52245abeb5ca2775ee019e77
2+
refs/heads/master: ee03b64817d0a008b2ca83183161d455b6d17f33
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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ cmake -G Ninja^
161161
-DCMAKE_CXX_COMPILER=clang-cl^
162162
-DCMAKE_EXE_LINKER_FLAGS:STRING="/INCREMENTAL:NO"^
163163
-DCMAKE_SHARED_LINKER_FLAGS:STRING="/INCREMENTAL:NO"^
164-
-DSWIFT_BUILD_SOURCEKIT=ON^
165164
-DSWIFT_INCLUDE_DOCS=OFF^
166165
-DSWIFT_PATH_TO_CMARK_SOURCE="S:\cmark"^
167166
-DSWIFT_PATH_TO_CMARK_BUILD="S:\b\cmark"^

trunk/utils/build-parser-lib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class Builder(object):
114114
cmake_args += ['-DSWIFT_BUILD_REMOTE_MIRROR=FALSE', '-DSWIFT_BUILD_DYNAMIC_STDLIB=FALSE',
115115
'-DSWIFT_BUILD_STATIC_STDLIB=FALSE', '-DSWIFT_BUILD_DYNAMIC_SDK_OVERLAY=FALSE',
116116
'-DSWIFT_BUILD_STATIC_SDK_OVERLAY=FALSE']
117-
cmake_args += ['-DLLVM_INCLUDE_TESTS=FALSE', '-DCLANG_INCLUDE_TESTS=FALSE']
117+
cmake_args += ['-DCMARK_TESTS=FALSE', '-DLLVM_INCLUDE_TESTS=FALSE', '-DCLANG_INCLUDE_TESTS=FALSE', '-DSWIFT_INCLUDE_TESTS=FALSE']
118118
cmake_args += [os.path.join(SWIFT_SOURCE_ROOT, 'llvm')]
119119
self.call(cmake_args)
120120

0 commit comments

Comments
 (0)