Skip to content

Commit 089e3a8

Browse files
committed
[cmake] tools/swift-reflection-test => stdlib/tools/swift-reflection-test.
If one thinks about it, swift's build has two sections: a runtime or target section (i.e. ./stdlib) and a host section (everything else). swift-reflection-test is an abberation from that pattern since it is built for target platforms but is in the section of host tools. In this commit, I move it into ./stdlib. Beyond being a bitter location conceptually this will additionally allow me to avoid a dependency cycle in between the compiler and the stdlib build. After this, there is only one more target in the compiler code: swift-lang. From talking with Xi Ge, we can move that into its own separate project as a package. Once that is done, I will not have any more cycles.
1 parent 2216c6b commit 089e3a8

File tree

8 files changed

+4
-5
lines changed

8 files changed

+4
-5
lines changed

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1029,10 +1029,6 @@ endif()
10291029

10301030
add_subdirectory(utils)
10311031

1032-
if(SWIFT_BUILD_DYNAMIC_STDLIB AND SWIFT_INCLUDE_TESTS)
1033-
add_subdirectory(tools/swift-reflection-test)
1034-
endif()
1035-
10361032
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
10371033
if(SWIFT_BUILD_PERF_TESTSUITE)
10381034
add_subdirectory(benchmark)

stdlib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,4 @@ swift_create_stdlib_targets("swift-test-stdlib" "" FALSE)
102102

103103
add_subdirectory(public)
104104
add_subdirectory(private)
105-
105+
add_subdirectory(tools)

stdlib/tools/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
if(SWIFT_BUILD_DYNAMIC_STDLIB AND SWIFT_INCLUDE_TESTS)
2+
add_subdirectory(swift-reflection-test)
3+
endif()

0 commit comments

Comments
 (0)