swiftlang · gribozavr · Jun 18, 2016 · Jun 14, 2016
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
@@ -361,6 +361,7 @@ endfunction()
 #     target
 #     name
 #     [SHARED]
+#     [STATIC]
 #     [SDK sdk]
 #     [ARCHITECTURE architecture]
 #     [DEPENDS dep1 ...]
@@ -390,6 +391,9 @@ endfunction()
 # SHARED
 #   Build a shared library.
 #
+# STATIC
+#   Build a static library.
+#
 # SDK sdk
 #   SDK to build for.
 #
@@ -448,7 +452,7 @@ endfunction()
 #   Sources to add into this library
 function(_add_swift_library_single target name)
   set(SWIFTLIB_SINGLE_options
-      SHARED OBJECT_LIBRARY IS_STDLIB IS_STDLIB_CORE IS_SDK_OVERLAY
+      SHARED STATIC OBJECT_LIBRARY IS_STDLIB IS_STDLIB_CORE IS_SDK_OVERLAY
       TARGET_LIBRARY FORCE_BUILD_FOR_HOST_SDK
       API_NOTES_NON_OVERLAY DONT_EMBED_BITCODE)
   cmake_parse_arguments(SWIFTLIB_SINGLE
@@ -473,6 +477,13 @@ function(_add_swift_library_single target name)
   if("${SWIFTLIB_SINGLE_INSTALL_IN_COMPONENT}" STREQUAL "")
     message(FATAL_ERROR "INSTALL_IN_COMPONENT is required")
   endif()
+
+  if(NOT SWIFTLIB_SINGLE_SHARED AND
+     NOT SWIFTLIB_SINGLE_STATIC AND
+     NOT SWIFTLIB_SINGLE_OBJECT_LIBRARY)
+    message(FATAL_ERROR
+        "Either SHARED, STATIC, or OBJECT_LIBRARY must be specified")
+  endif()
 
   # Determine the subdirectory where this library will be installed.
   set(SWIFTLIB_SINGLE_SUBDIR
@@ -681,7 +692,7 @@ function(_add_swift_library_single target name)
   # Do these LAST.
 
   set(target_static)
-  if(SWIFTLIB_SINGLE_IS_STDLIB AND SWIFT_BUILD_STATIC_STDLIB)
+  if(SWIFTLIB_SINGLE_IS_STDLIB AND SWIFTLIB_SINGLE_STATIC)
     set(target_static "${target}-static")
 
     # We have already compiled Swift sources.  Link everything into a static
@@ -920,6 +931,7 @@ endfunction()
 # Usage:
 #   add_swift_library(name
 #     [SHARED]
+#     [STATIC]
 #     [DEPENDS dep1 ...]
 #     [LINK_LIBRARIES dep1 ...]
 #     [INTERFACE_LINK_LIBRARIES dep1 ...]
@@ -949,6 +961,9 @@ endfunction()
 # SHARED
 #   Build a shared library.
 #
+# STATIC
+#   Build a static library.
+#
 # DEPENDS
 #   Targets that this library depends on.
 #
@@ -1028,7 +1043,7 @@ endfunction()
 #   Sources to add into this library.
 function(add_swift_library name)
   set(SWIFTLIB_options
-      SHARED OBJECT_LIBRARY IS_STDLIB IS_STDLIB_CORE IS_SDK_OVERLAY
+      SHARED STATIC OBJECT_LIBRARY IS_STDLIB IS_STDLIB_CORE IS_SDK_OVERLAY
       TARGET_LIBRARY FORCE_BUILD_FOR_HOST_SDK
       API_NOTES_NON_OVERLAY DONT_EMBED_BITCODE HAS_SWIFT_CONTENT)
   cmake_parse_arguments(SWIFTLIB
@@ -1042,7 +1057,6 @@ function(add_swift_library name)
 
   if(SWIFTLIB_IS_SDK_OVERLAY)
     set(SWIFTLIB_HAS_SWIFT_CONTENT TRUE)
-    set(SWIFTLIB_SHARED TRUE)
     set(SWIFTLIB_IS_STDLIB TRUE)
     set(SWIFTLIB_TARGET_LIBRARY TRUE)
 
@@ -1104,6 +1118,13 @@ function(add_swift_library name)
   if("${SWIFTLIB_INSTALL_IN_COMPONENT}" STREQUAL "")
     message(FATAL_ERROR "INSTALL_IN_COMPONENT is required")
   endif()
+
+  if(NOT SWIFTLIB_SHARED AND
+     NOT SWIFTLIB_STATIC AND
+     NOT SWIFTLIB_OBJECT_LIBRARY)
+    message(FATAL_ERROR
+        "Either SHARED, STATIC, or OBJECT_LIBRARY must be specified")
+  endif()
 
   if(SWIFTLIB_TARGET_LIBRARY)
     # If we are building this library for targets, loop through the various
@@ -1196,6 +1217,7 @@ function(add_swift_library name)
           ${VARIANT_NAME}
           ${name}
           ${SWIFTLIB_SHARED_keyword}
+          ${SWIFTLIB_STATIC_keyword}
           ${SWIFTLIB_OBJECT_LIBRARY_keyword}
           ${SWIFTLIB_SOURCES}
           SDK ${sdk}
@@ -1231,7 +1253,7 @@ function(add_swift_library name)
             endif()
           endforeach()
 
-          if (SWIFT_BUILD_STATIC_STDLIB AND SWIFTLIB_IS_STDLIB)
+          if (SWIFTLIB_IS_STDLIB AND SWIFTLIB_STATIC)
             # Add dependencies on the (not-yet-created) custom lipo target.
             foreach(DEP ${SWIFTLIB_LINK_LIBRARIES})
               if (NOT "${DEP}" STREQUAL "icucore")
@@ -1300,7 +1322,7 @@ function(add_swift_library name)
         # If we built static variants of the library, create a lipo target for
         # them.
         set(lipo_target_static)
-        if (SWIFT_BUILD_STATIC_STDLIB AND SWIFTLIB_IS_STDLIB)
+        if (SWIFTLIB_IS_STDLIB AND SWIFTLIB_STATIC)
           set(THIN_INPUT_TARGETS_STATIC)
           foreach(TARGET ${THIN_INPUT_TARGETS})
             list(APPEND THIN_INPUT_TARGETS_STATIC "${TARGET}-static")
@@ -1366,6 +1388,8 @@ function(add_swift_library name)
       ${name}
       ${name}
       ${SWIFTLIB_SHARED_keyword}
+      ${SWIFTLIB_STATIC_keyword}
+      ${SWIFTLIB_OBJECT_LIBRARY_keyword}
       ${SWIFTLIB_SOURCES}
       SDK ${sdk}
       ARCHITECTURE ${arch}

diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftAST
+add_swift_library(swiftAST STATIC
   ArchetypeBuilder.cpp
   ASTContext.cpp
   ASTDumper.cpp

diff --git a/lib/ASTSectionImporter/CMakeLists.txt b/lib/ASTSectionImporter/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftASTSectionImporter
+add_swift_library(swiftASTSectionImporter STATIC
   ASTSectionImporter.cpp
   LINK_LIBRARIES swiftBasic
   COMPONENT_DEPENDS core)

diff --git a/lib/Basic/CMakeLists.txt b/lib/Basic/CMakeLists.txt
@@ -58,7 +58,7 @@ generate_revision_inc(swift_revision_inc Swift "${SWIFT_SOURCE_DIR}")
 set(version_inc_files
   ${llvm_revision_inc} ${clang_revision_inc} ${swift_revision_inc})
 
-add_swift_library(swiftBasic
+add_swift_library(swiftBasic STATIC
   Cache.cpp
   ClusteredBitVector.cpp
   Demangle.cpp

diff --git a/lib/ClangImporter/CMakeLists.txt b/lib/ClangImporter/CMakeLists.txt
@@ -8,7 +8,7 @@ handle_gyb_sources(
     generated_include_sources
     "")
 
-add_swift_library(swiftClangImporter
+add_swift_library(swiftClangImporter STATIC
   CFTypeInfo.cpp
   ClangDiagnosticConsumer.cpp
   ClangImporter.cpp

diff --git a/lib/Driver/CMakeLists.txt b/lib/Driver/CMakeLists.txt
@@ -14,7 +14,7 @@ set(swiftDriver_sources
 
 set(swiftDriver_targetDefines)
 
-add_swift_library(swiftDriver
+add_swift_library(swiftDriver STATIC
   ${swiftDriver_sources}
   DEPENDS SwiftOptions
   LINK_LIBRARIES swiftAST swiftBasic swiftFrontend swiftOption)

diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftFrontend
+add_swift_library(swiftFrontend STATIC
   CompilerInvocation.cpp
   DiagnosticVerifier.cpp
   Frontend.cpp

diff --git a/lib/FrontendTool/CMakeLists.txt b/lib/FrontendTool/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftFrontendTool
+add_swift_library(swiftFrontendTool STATIC
   FrontendTool.cpp
   DEPENDS SwiftOptions
   LINK_LIBRARIES

diff --git a/lib/IDE/CMakeLists.txt b/lib/IDE/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftIDE
+add_swift_library(swiftIDE STATIC
   CodeCompletion.cpp
   CodeCompletionCache.cpp
   CommentConversion.cpp

diff --git a/lib/IRGen/CMakeLists.txt b/lib/IRGen/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftIRGen
+add_swift_library(swiftIRGen STATIC
   DebugTypeInfo.cpp
   EnumPayload.cpp
   ExtraInhabitants.cpp

diff --git a/lib/Immediate/CMakeLists.txt b/lib/Immediate/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftImmediate
+add_swift_library(swiftImmediate STATIC
   Immediate.cpp
   REPL.cpp
   LINK_LIBRARIES

diff --git a/lib/Index/CMakeLists.txt b/lib/Index/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftIndex
+add_swift_library(swiftIndex STATIC
   Index.cpp
   IndexDataConsumer.cpp
   IndexSymbol.cpp

diff --git a/lib/LLVMPasses/CMakeLists.txt b/lib/LLVMPasses/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftLLVMPasses
+add_swift_library(swiftLLVMPasses STATIC
   LLVMSwiftAA.cpp
   LLVMSwiftRCIdentity.cpp
   LLVMARCOpts.cpp

diff --git a/lib/Markup/CMakeLists.txt b/lib/Markup/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftMarkup
+add_swift_library(swiftMarkup STATIC
   AST.cpp
   LineList.cpp
   Markup.cpp

diff --git a/lib/Option/CMakeLists.txt b/lib/Option/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftOption
+add_swift_library(swiftOption STATIC
   Options.cpp
   SanitizerOptions.cpp
   DEPENDS SwiftOptions

diff --git a/lib/Parse/CMakeLists.txt b/lib/Parse/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftParse
+add_swift_library(swiftParse STATIC
   Lexer.cpp
   ParseDecl.cpp
   ParseExpr.cpp

diff --git a/lib/PrintAsObjC/CMakeLists.txt b/lib/PrintAsObjC/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftPrintAsObjC
+add_swift_library(swiftPrintAsObjC STATIC
   PrintAsObjC.cpp
 
   LINK_LIBRARIES

diff --git a/lib/RemoteAST/CMakeLists.txt b/lib/RemoteAST/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftRemoteAST
+add_swift_library(swiftRemoteAST STATIC
   RemoteAST.cpp
   LINK_LIBRARIES
     swiftSema swiftIRGen)
diff --git a/lib/SIL/CMakeLists.txt b/lib/SIL/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftSIL
+add_swift_library(swiftSIL STATIC
   AbstractionPattern.cpp
   Bridging.cpp
   Dominance.cpp

diff --git a/lib/SILGen/CMakeLists.txt b/lib/SILGen/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftSILGen
+add_swift_library(swiftSILGen STATIC
   ArgumentSource.cpp
   Cleanup.cpp
   Condition.cpp

diff --git a/lib/SILOptimizer/CMakeLists.txt b/lib/SILOptimizer/CMakeLists.txt
@@ -8,7 +8,7 @@ add_subdirectory(SILCombiner)
 add_subdirectory(Transforms)
 add_subdirectory(UtilityPasses)
 add_subdirectory(Utils)
-add_swift_library(swiftSILOptimizer
+add_swift_library(swiftSILOptimizer STATIC
   ${ARC_SOURCES}
   ${ANALYSIS_SOURCES}
   ${SILCOMBINER_SOURCES}

diff --git a/lib/Sema/CMakeLists.txt b/lib/Sema/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftSema
+add_swift_library(swiftSema STATIC
   CodeSynthesis.cpp
   Constraint.cpp
   ConstraintGraph.cpp

diff --git a/lib/Serialization/CMakeLists.txt b/lib/Serialization/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftSerialization
+add_swift_library(swiftSerialization STATIC
   Deserialization.cpp
   DeserializeSIL.cpp
   ModuleFile.cpp

diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt
@@ -10,6 +10,12 @@ else()
   set(CMAKE_C_COMPILER_ARG1 "")
 endif()
 
+# FIXME: Make it possible to build *only* static libraries for the stdlib.
+set(SWIFT_STDLIB_LIBRARY_BUILD_TYPES SHARED)
+if(SWIFT_BUILD_STATIC_STDLIB)
+  list(APPEND SWIFT_STDLIB_LIBRARY_BUILD_TYPES STATIC)
+endif()
+
 add_custom_target(swift-stdlib-all)
 foreach(SDK ${SWIFT_SDKS})
   add_custom_target("swift-stdlib-${SWIFT_SDK_${SDK}_LIB_SUBDIR}")

diff --git a/stdlib/internal/SwiftExperimental/CMakeLists.txt b/stdlib/internal/SwiftExperimental/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftSwiftExperimental SHARED IS_STDLIB
+add_swift_library(swiftSwiftExperimental ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   SwiftExperimental.swift

diff --git a/stdlib/private/StdlibCollectionUnittest/CMakeLists.txt b/stdlib/private/StdlibCollectionUnittest/CMakeLists.txt
@@ -9,7 +9,7 @@ if(SWIFT_HOST_VARIANT MATCHES "${SWIFT_DARWIN_VARIANTS}")
     Foundation)
 endif()
 
-add_swift_library(swiftStdlibCollectionUnittest SHARED IS_STDLIB
+add_swift_library(swiftStdlibCollectionUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   StdlibCollectionUnittest.swift

diff --git a/stdlib/private/StdlibUnittest/CMakeLists.txt b/stdlib/private/StdlibUnittest/CMakeLists.txt
@@ -22,7 +22,7 @@ if(SWIFT_SERIALIZE_STDLIB_UNITTEST)
   list(APPEND swift_stdlib_unittest_compile_flags "-Xfrontend" "-sil-serialize-all")
 endif()
 
-add_swift_library(swiftStdlibUnittest SHARED IS_STDLIB
+add_swift_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   StdlibUnittest.swift.gyb

diff --git a/stdlib/private/StdlibUnittestFoundationExtras/CMakeLists.txt b/stdlib/private/StdlibUnittestFoundationExtras/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftStdlibUnittestFoundationExtras SHARED IS_STDLIB
+add_swift_library(swiftStdlibUnittestFoundationExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   StdlibUnittestFoundationExtras.swift

diff --git a/stdlib/private/SwiftPrivate/CMakeLists.txt b/stdlib/private/SwiftPrivate/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftSwiftPrivate SHARED IS_STDLIB
+add_swift_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   SwiftPrivate.swift

diff --git a/stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt b/stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt
@@ -9,7 +9,7 @@ elseif(SWIFT_HOST_VARIANT STREQUAL "linux" OR SWIFT_HOST_VARIANT STREQUAL "freeb
     Glibc)
 endif()
 
-add_swift_library(swiftSwiftPrivateLibcExtras SHARED IS_STDLIB
+add_swift_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   SwiftPrivateLibcExtras.swift

diff --git a/stdlib/private/SwiftPrivatePthreadExtras/CMakeLists.txt b/stdlib/private/SwiftPrivatePthreadExtras/CMakeLists.txt
@@ -8,7 +8,7 @@ elseif(SWIFT_HOST_VARIANT STREQUAL "linux" OR SWIFT_HOST_VARIANT STREQUAL "freeb
     Glibc)
 endif()
 
-add_swift_library(swiftSwiftPrivatePthreadExtras SHARED IS_STDLIB
+add_swift_library(swiftSwiftPrivatePthreadExtras ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   SwiftPrivatePthreadExtras.swift

diff --git a/stdlib/private/SwiftReflectionTest/CMakeLists.txt b/stdlib/private/SwiftReflectionTest/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftSwiftReflectionTest SHARED IS_STDLIB
+add_swift_library(swiftSwiftReflectionTest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   SwiftReflectionTest.swift
   SWIFT_MODULE_DEPENDS Darwin
   INSTALL_IN_COMPONENT stdlib-experimental)

diff --git a/stdlib/public/Platform/CMakeLists.txt b/stdlib/public/Platform/CMakeLists.txt
@@ -24,7 +24,7 @@ else()
       DEPENDS glibc_modulemap)
 endif()
 
-add_swift_library(${swift_platform_name} IS_SDK_OVERLAY
+add_swift_library(${swift_platform_name} ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
     ${swift_platform_sources}
     ${swift_platform_flags})
 

diff --git a/stdlib/public/Reflection/CMakeLists.txt b/stdlib/public/Reflection/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftReflection TARGET_LIBRARY FORCE_BUILD_FOR_HOST_SDK
+add_swift_library(swiftReflection STATIC TARGET_LIBRARY FORCE_BUILD_FOR_HOST_SDK
   Demangle.cpp
   MetadataSource.cpp
   Remangle.cpp

diff --git a/stdlib/public/SDK/AVFoundation/CMakeLists.txt b/stdlib/public/SDK/AVFoundation/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftAVFoundation IS_SDK_OVERLAY
+add_swift_library(swiftAVFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
   AVFoundation.swift
   TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
   SWIFT_MODULE_DEPENDS Foundation CoreMedia

diff --git a/stdlib/public/SDK/AppKit/CMakeLists.txt b/stdlib/public/SDK/AppKit/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftAppKit IS_SDK_OVERLAY
+add_swift_library(swiftAppKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
   AppKit.swift
   AppKit_FoundationExtensions.swift
   NSError.swift

diff --git a/stdlib/public/SDK/AssetsLibrary/CMakeLists.txt b/stdlib/public/SDK/AssetsLibrary/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_swift_library(swiftAssetsLibrary IS_SDK_OVERLAY
+add_swift_library(swiftAssetsLibrary ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
   AssetsLibrary.swift
   TARGET_SDKS IOS IOS_SIMULATOR
   SWIFT_MODULE_DEPENDS ObjectiveC Foundation CoreGraphics

diff --git a/stdlib/public/SDK/CMakeLists.txt b/stdlib/public/SDK/CMakeLists.txt
@@ -1,5 +1,11 @@
 # All libraries in this directory tree are overlays that depend on Darwin SDK.
 
+# FIXME: Make it possible to build *only* static libraries for the SDK overlays.
+set(SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES SHARED)
+if(SWIFT_BUILD_STATIC_STDLIB)
+  list(APPEND SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES STATIC)
+endif()
+
 # Please keep this list sorted.
 add_subdirectory(AppKit)
 add_subdirectory(AVFoundation)