Merge pull request #2840 from apple/cmake-use-object-libraries-fix-fallout

Fix fallout from "CMake: use object libraries"

Author: gribozavr

cmake/dummy.c renamed to cmake/dummy.cpp

@@ -488,6 +488,10 @@ function(_add_swift_library_single target name)
 
     file(GLOB_RECURSE SWIFTLIB_SINGLE_TDS
       ${SWIFT_SOURCE_DIR}/include/swift${dir}/*.td)
+
+    set_source_files_properties(${SWIFTLIB_SINGLE_HEADERS} ${SWIFTLIB_SINGLE_TDS}
+      PROPERTIES
+      HEADER_FILE_ONLY true)
     source_group("TableGen descriptions" FILES ${SWIFTLIB_SINGLE_TDS})
 
     set(SWIFTLIB_SINGLE_SOURCES ${SWIFTLIB_SINGLE_SOURCES} ${SWIFTLIB_SINGLE_HEADERS} ${SWIFTLIB_SINGLE_TDS})
@@ -575,11 +579,20 @@ function(_add_swift_library_single target name)
         $<TARGET_OBJECTS:${object_library}${VARIANT_SUFFIX}>)
   endforeach()
 
+  set(SWIFTLIB_SINGLE_XCODE_WORKAROUND_SOURCES)
+  if(XCODE AND SWIFTLIB_SINGLE_TARGET_LIBRARY)
+    set(SWIFTLIB_SINGLE_XCODE_WORKAROUND_SOURCES
+        # Note: the dummy.cpp source file provides no definitions. However,
+        # it forces Xcode to properly link the static library.
+        ${SWIFT_SOURCE_DIR}/cmake/dummy.cpp)
+  endif()
+
   add_library("${target}" ${libkind}
       ${SWIFT_SECTIONS_OBJECT_BEGIN}
       ${SWIFTLIB_SINGLE_SOURCES}
       ${SWIFTLIB_SINGLE_EXTERNAL_SOURCES}
       ${SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS}
+      ${SWIFTLIB_SINGLE_XCODE_WORKAROUND_SOURCES}
       ${SWIFT_SECTIONS_OBJECT_END})
 
   # The section metadata objects are generated sources, and we need to tell CMake
@@ -661,10 +674,7 @@ function(_add_swift_library_single target name)
     add_library(${target_static} STATIC
         ${SWIFTLIB_SINGLE_SOURCES}
         ${SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS}
-
-        # Note: the dummy.c source file provides no definitions. However,
-        # it forces Xcode to properly link the static library.
-        ${SWIFT_SOURCE_DIR}/cmake/dummy.c)
+        ${SWIFTLIB_SINGLE_XCODE_WORKAROUND_SOURCES})
 
     set_output_directory(${target_static}
         BINARY_DIR ${SWIFT_RUNTIME_OUTPUT_INTDIR}

cmake/modules/AddSwift.cmake

@@ -49,7 +49,7 @@ set(swift_runtime_sources
     Casting.cpp
     Demangle.cpp
     Enum.cpp
-    ErrorObject.cpp
+    ErrorObjectNative.cpp
     Errors.cpp
     Heap.cpp
     HeapObject.cpp
@@ -59,9 +59,9 @@ set(swift_runtime_sources
     Once.cpp
     Portability.cpp
     ProtocolConformance.cpp
-    Reflection.cpp
+    ReflectionNative.cpp
     RuntimeEntrySymbols.cpp
-    SwiftObject.cpp)
+    SwiftObjectNative.cpp)
 
 # Acknowledge that the following sources are known.
 set(LLVM_OPTIONAL_SOURCES