Merge remote-tracking branch 'origin/master' into master-next

swift-ci · swift-ci · commit b1253c1381bf · 2019-03-06T21:09:43.000-08:00
diff --git a/tools/SourceKit/tools/swift-lang/CMakeLists.txt b/tools/SourceKit/tools/swift-lang/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(NOT SWIFT_SOURCEKIT_USE_INPROC_LIBRARY AND SWIFT_BUILD_STDLIB)
+if(NOT SWIFT_SOURCEKIT_USE_INPROC_LIBRARY AND SWIFT_BUILD_STDLIB AND SWIFT_BUILD_SDK_OVERLAY)
   set(EXTRA_COMPILE_FLAGS "-F" "${SWIFT_LIBRARY_OUTPUT_INTDIR}")
   set(SOURCEKITD_LINK_LIBS sourcekitd)
   set(INSTALLED_COMP sourcekit-xpc-service)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-if(NOT SWIFT_SOURCEKIT_USE_INPROC_LIBRARY AND SWIFT_BUILD_STDLIB)`
	`1`	`+if(NOT SWIFT_SOURCEKIT_USE_INPROC_LIBRARY AND SWIFT_BUILD_STDLIB AND SWIFT_BUILD_SDK_OVERLAY)`
`2`	`2`	`set(EXTRA_COMPILE_FLAGS "-F" "${SWIFT_LIBRARY_OUTPUT_INTDIR}")`
`3`	`3`	`set(SOURCEKITD_LINK_LIBS sourcekitd)`
`4`	`4`	`set(INSTALLED_COMP sourcekit-xpc-service)`