---

yaml
---
r: 346841
b: refs/heads/master
c: 93184c5
h: refs/heads/master
i:
  346839: 05de8dd

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b9d476e39c75ea121e76754f2baf91f0559d76f6
+refs/heads/master: 93184c549a7ab969f877dd112a98f2a09f855807
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/tools/SourceKit/tools/swift-lang/CMakeLists.txt

@@ -4,7 +4,16 @@ if(NOT SWIFT_SOURCEKIT_USE_INPROC_LIBRARY AND SWIFT_BUILD_STDLIB)
   set(INSTALLED_COMP sourcekit-xpc-service)
   set(DEPENDS_LIST "sourcekitd-test")
 
-  add_swift_target_library(swiftSwiftLang SHARED
+  # The build type of swiftlang should agree with stdlib
+  set(SWIFT_LANG_LIBRARY_BUILD_TYPES)
+  if(SWIFT_BUILD_DYNAMIC_STDLIB)
+    list(APPEND SWIFT_LANG_LIBRARY_BUILD_TYPES SHARED)
+  endif()
+  if(SWIFT_BUILD_STATIC_STDLIB)
+    list(APPEND SWIFT_LANG_LIBRARY_BUILD_TYPES STATIC)
+  endif()
+
+  add_swift_target_library(swiftSwiftLang ${SWIFT_LANG_LIBRARY_BUILD_TYPES}
     SwiftLang.swift
     SourceKitdClient.swift
     SourceKitdRequest.swift