Skip to content

Commit 8faa962

Browse files
authored
Merge pull request #26307 from Rostepher/toolchain-only-layouts-5.1
[Build System: CMake] New stdlib/toolchain directory for toolchain-only content (5.1 branch).
2 parents 3baa54f + 54cc408 commit 8faa962

File tree

14 files changed

+3
-2
lines changed

14 files changed

+3
-2
lines changed

stdlib/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,5 @@ swift_create_stdlib_targets("swift-test-stdlib" "" FALSE)
115115

116116
add_subdirectory(public)
117117
add_subdirectory(private)
118+
add_subdirectory(toolchain)
118119
add_subdirectory(tools)

stdlib/public/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ if(CXX_SUPPORTS_DEFAULT_HIDDEN_VISIBILITY)
5252
list(APPEND SWIFT_RUNTIME_CORE_CXX_FLAGS "-fvisibility=hidden")
5353
endif()
5454

55-
add_subdirectory(legacy_layouts)
5655
add_subdirectory(SwiftShims)
5756

5857
if(SWIFT_BUILD_STDLIB)

stdlib/toolchain/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
add_subdirectory(legacy_layouts)

stdlib/public/legacy_layouts/CMakeLists.txt renamed to stdlib/toolchain/legacy_layouts/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ foreach(sdk ${SWIFT_SDKS})
44
foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES})
55
set(platform "${SWIFT_SDK_${sdk}_LIB_SUBDIR}")
66

7-
set(input "${SWIFT_SOURCE_DIR}/stdlib/public/legacy_layouts/${platform}/layouts-${arch}.yaml")
7+
set(input "${SWIFT_SOURCE_DIR}/stdlib/toolchain/legacy_layouts/${platform}/layouts-${arch}.yaml")
88
set(output "${SWIFTLIB_DIR}/${platform}/layouts-${arch}.yaml")
99

1010
set(copy_target "copy-legacy-layouts-${platform}-${arch}")

0 commit comments

Comments
 (0)