build: split out swiftReflection builds

We would build two copies of swiftReflection, one for the host and one
for the target.  However, the compiler configuration cannot be swapped
out in the middle as we were attempting to do.  This would result in a
failure to build sometimes due to the missing dependency on the wanted
compiler.  More importantly, it would also use the wrong compiler when
building the library.  Although this duplicates the source paths,
correctness is preserved.

Author: compnerd

CMakeLists.txt

@@ -1096,7 +1096,6 @@ else()
   # Some tools (e.g. swift-reflection-dump) rely on a host swiftReflection, so
   # ensure we build that when building tools.
   if(SWIFT_INCLUDE_TOOLS)
-    add_subdirectory(stdlib/public/Reflection)
     add_subdirectory(stdlib/public/SwiftShims)
   endif()
 endif()

lib/CMakeLists.txt

@@ -37,6 +37,7 @@ add_subdirectory(RemoteAST)
 add_subdirectory(Sema)
 add_subdirectory(Serialization)
 add_subdirectory(SwiftDemangle)
+add_subdirectory(SwiftReflection)
 add_subdirectory(SIL)
 add_subdirectory(SILGen)
 add_subdirectory(SILOptimizer)

lib/SwiftReflection/CMakeLists.txt

@@ -0,0 +1,8 @@
+
+add_swift_host_library(swiftReflection STATIC
+  ${SWIFT_SOURCE_DIR}/stdlib/public/Reflection/MetadataSource.cpp
+  ${SWIFT_SOURCE_DIR}/stdlib/public/Reflection/TypeLowering.cpp
+  ${SWIFT_SOURCE_DIR}/stdlib/public/Reflection/TypeRef.cpp
+  ${SWIFT_SOURCE_DIR}/stdlib/public/Reflection/TypeRefBuilder.cpp)
+target_link_libraries(swiftReflection PUBLIC
+  swiftDemangling)

stdlib/public/Reflection/CMakeLists.txt

@@ -28,29 +28,3 @@ if(SWIFT_BUILD_STDLIB)
     INSTALL_IN_COMPONENT dev)
 endif()
 
-# Build a specific version for the host with the host toolchain.  This is going
-# to be used by tools (e.g. lldb)
-if(SWIFT_INCLUDE_TOOLS)
-  if(NOT SWIFT_BUILD_STDLIB)
-    add_custom_target(swiftReflection-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR})
-  endif()
-
-  if(NOT SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)
-    set(CURRENT_CMAKE_C_COMPILER ${CMAKE_C_COMPILER})
-    set(CURRENT_CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER})
-    set(CMAKE_C_COMPILER ${HOST_CMAKE_C_COMPILER})
-    set(CMAKE_CXX_COMPILER ${HOST_CMAKE_CXX_COMPILER})
-  endif()
-
-  add_swift_host_library(swiftReflection STATIC
-    ${swiftReflection_SOURCES})
-  target_compile_options(swiftReflection PRIVATE
-    ${SWIFT_RUNTIME_CXX_FLAGS})
-  set_property(TARGET swiftReflection
-    APPEND_STRING PROPERTY LINK_FLAGS ${SWIFT_RUNTIME_LINK_FLAGS})
-
-  if(NOT SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)
-    set(CMAKE_C_COMPILER ${CURRENT_CMAKE_C_COMPILER})
-    set(CMAKE_CXX_COMPILER ${CURRENT_CMAKE_CXX_COMPILER})
-  endif()
-endif()