Rename the libswift directory to SwiftCompilerSources

CMakeLists.txt

@@ -1123,7 +1123,7 @@ if(SWIFT_INCLUDE_TOOLS)
   # which is used in add_swift_host_tool for the lldb workaround.
   #
   # NOTE: We do not currently support libswift with the Xcode generator.
-  add_subdirectory(libswift)
+  add_subdirectory(SwiftCompilerSources)
 
   # Always include this after including stdlib/!
   # Refer to the large comment above the add_subdirectory(stdlib) call.

SwiftCompilerSources/CMakeLists.txt

@@ -7,7 +7,7 @@
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
 # A dummy libswift if libswift is disabled
-add_swift_host_library(libswiftStub OBJECT LibSwiftStubs.cpp)
+add_swift_host_library(libswiftStub OBJECT stubs.cpp)
 
 if (NOT LIBSWIFT_BUILD_MODE)
 
@@ -80,5 +80,6 @@ else()
   else()
     message(FATAL_ERROR "Unknown LIBSWIFT_BUILD_MODE '${LIBSWIFT_BUILD_MODE}'")
   endif()
+
 endif()
 

SwiftCompilerSources/Package.swift

@@ -11,7 +11,7 @@ let package = Package(
     .library(
       name: "Swift",
       type: .static,
-      targets: ["SIL", "Optimizer"]),
+      targets: ["SIL", "Optimizer", "ExperimentalRegex"]),
   ],
   dependencies: [
   ],
@@ -25,9 +25,16 @@ let package = Package(
           "-I", "../include/swift",
           "-cross-module-optimization"
         ])]),
+    .target(
+      name: "ExperimentalRegex",
+      dependencies: [],
+      swiftSettings: [SwiftSetting.unsafeFlags([
+          "-I", "../include/swift",
+          "-cross-module-optimization"
+        ])]),
     .target(
       name: "Optimizer",
-      dependencies: ["SIL"],
+      dependencies: ["SIL", "ExperimentalRegex"],
       swiftSettings: [SwiftSetting.unsafeFlags([
           "-I", "../include/swift",
           "-cross-module-optimization"