[Build] Rename the swiftRuntime target in the new build system.

This needs to be renamed now to match the new name in the old build
system.

Author: al45tair

Runtimes/Core/core/CMakeLists.txt

@@ -302,7 +302,7 @@ target_compile_options(swiftCore PRIVATE
 
 target_link_libraries(swiftCore
   PRIVATE
-    swiftRuntime
+    swiftRuntimeCore
     swiftLLVMSupport
     swiftDemangling
     swiftShims
@@ -312,7 +312,7 @@ target_link_options(swiftCore PRIVATE
   -nostartfiles)
 if(NOT POLICY CMP0157)
   target_compile_options(swiftCore PRIVATE
-    $<TARGET_OBJECTS:swiftRuntime>
+    $<TARGET_OBJECTS:swiftRuntimeCore>
     $<TARGET_OBJECTS:swiftLLVMSupport>
     $<TARGET_OBJECTS:swiftDemangling>
     $<TARGET_OBJECTS:swiftStdlibStubs>

Runtimes/Core/runtime/CMakeLists.txt

@@ -14,7 +14,7 @@ configure_file("CMakeConfig.h.in"
   "${PROJECT_BINARY_DIR}/include/swift/Runtime/CMakeConfig.h"
   ESCAPE_QUOTES @ONLY)
 
-add_library(swiftRuntime OBJECT
+add_library(swiftRuntimeCore OBJECT
     "${PROJECT_SOURCE_DIR}/CompatibilityOverride/CompatibilityOverride.cpp"
     AnyHashableSupport.cpp
     Array.cpp
@@ -68,7 +68,7 @@ add_library(swiftRuntime OBJECT
     Win32.cpp)
 
 if(SwiftCore_ENABLE_RUNTIME_LEAK_CHECKER)
-  target_sources(swiftRuntime PRIVATE
+  target_sources(swiftRuntimeCore PRIVATE
     Leaks.mm)
 endif()
 
@@ -83,10 +83,10 @@ endif()
 
 # TODO: Probably worth considering putting half of these in a RuntimeConfig.h.in
 #       file rather than pushing them through macro flags.
-target_compile_definitions(swiftRuntime
+target_compile_definitions(swiftRuntimeCore
   PRIVATE
     -DSWIFT_RUNTIME
-    -DSWIFT_TARGET_LIBRARY_NAME=swiftRuntime
+    -DSWIFT_TARGET_LIBRARY_NAME=swiftRuntimeCore
     $<$<BOOL:${BUILD_SHARED_LIBS}>:-DswiftCore_EXPORTS>
     $<$<BOOL:${SwiftCore_ENABLE_BACKTRACING}>:-DSWIFT_ENABLE_BACKTRACING>
     $<$<BOOL:${SwiftCore_ENABLE_OVERRIDABLE_RETAIN_RELEASE}>:-DSWIFT_STDLIB_OVERRIDABLE_RETAIN_RELEASE>
@@ -105,39 +105,39 @@ target_compile_definitions(swiftRuntime
   PUBLIC
     $<$<BOOL:${SwiftCore_ENABLE_OS_TRACE_LAZY_INIT}>:-DSWIFT_USE_OS_TRACE_LAZY_INIT>)
 
-target_include_directories(swiftRuntime PRIVATE
+target_include_directories(swiftRuntimeCore PRIVATE
   "${PROJECT_BINARY_DIR}/include"
   "${CMAKE_CURRENT_SOURCE_DIR}")
 
-target_link_libraries(swiftRuntime PRIVATE
+target_link_libraries(swiftRuntimeCore PRIVATE
   $<$<PLATFORM_ID:Windows>:User32>
   swiftShims
   swiftDemangling)
 
 # FIXME: Refactor so that we're not pulling sources from the compiler files
-target_sources(swiftRuntime PRIVATE
+target_sources(swiftRuntimeCore PRIVATE
   "${SwiftCore_SWIFTC_SOURCE_DIR}/lib/Threading/ThreadSanitizer.cpp")
 
 # FIXME: Private.h uses `Demangler.h` and `TypeLookupError.h` from the compiler
 #        headers. We should split out the parts that are needed by the runtime
 #        to avoid pulling in headers from the compiler.
-target_include_directories(swiftRuntime PRIVATE
+target_include_directories(swiftRuntimeCore PRIVATE
   "${SwiftCore_SWIFTC_SOURCE_DIR}/include")
 
 if(SwiftCore_ENABLE_BACKTRACING)
-  target_sources(swiftRuntime PRIVATE
+  target_sources(swiftRuntimeCore PRIVATE
     Backtrace.cpp
     BacktraceUtils.cpp
     CrashHandlerMacOS.cpp
     CrashHandlerLinux.cpp)
 endif()
 
-target_sources(swiftRuntime PRIVATE
+target_sources(swiftRuntimeCore PRIVATE
   ErrorObject.mm
   SwiftObject.mm)
 
 if(SwiftCore_ENABLE_OBJC_INTEROP)
-  target_sources(swiftRuntime PRIVATE
+  target_sources(swiftRuntimeCore PRIVATE
     SwiftValue.mm
     ReflectionMirrorObjC.mm
     ObjCRuntimeGetImageNameFromClass.mm)