Skip to content

Commit 4beb94c

Browse files
committed
Rename the libswift directory to SwiftCompilerSources
1 parent a0693c4 commit 4beb94c

39 files changed

+12
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,7 @@ if(SWIFT_INCLUDE_TOOLS)
11231123
# which is used in add_swift_host_tool for the lldb workaround.
11241124
#
11251125
# NOTE: We do not currently support libswift with the Xcode generator.
1126-
add_subdirectory(libswift)
1126+
add_subdirectory(SwiftCompilerSources)
11271127

11281128
# Always include this after including stdlib/!
11291129
# Refer to the large comment above the add_subdirectory(stdlib) call.

libswift/CMakeLists.txt renamed to SwiftCompilerSources/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
88

99
# A dummy libswift if libswift is disabled
10-
add_swift_host_library(libswiftStub OBJECT LibSwiftStubs.cpp)
10+
add_swift_host_library(libswiftStub OBJECT stubs.cpp)
1111

1212
if (NOT LIBSWIFT_BUILD_MODE)
1313

@@ -80,5 +80,6 @@ else()
8080
else()
8181
message(FATAL_ERROR "Unknown LIBSWIFT_BUILD_MODE '${LIBSWIFT_BUILD_MODE}'")
8282
endif()
83+
8384
endif()
8485

libswift/Package.swift renamed to SwiftCompilerSources/Package.swift

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ let package = Package(
1111
.library(
1212
name: "Swift",
1313
type: .static,
14-
targets: ["SIL", "Optimizer"]),
14+
targets: ["SIL", "Optimizer", "ExperimentalRegex"]),
1515
],
1616
dependencies: [
1717
],
@@ -25,9 +25,16 @@ let package = Package(
2525
"-I", "../include/swift",
2626
"-cross-module-optimization"
2727
])]),
28+
.target(
29+
name: "ExperimentalRegex",
30+
dependencies: [],
31+
swiftSettings: [SwiftSetting.unsafeFlags([
32+
"-I", "../include/swift",
33+
"-cross-module-optimization"
34+
])]),
2835
.target(
2936
name: "Optimizer",
30-
dependencies: ["SIL"],
37+
dependencies: ["SIL", "ExperimentalRegex"],
3138
swiftSettings: [SwiftSetting.unsafeFlags([
3239
"-I", "../include/swift",
3340
"-cross-module-optimization"
File renamed without changes.

0 commit comments

Comments
 (0)