Merge pull request swiftlang#26305 from Rostepher/toolchain-only-layouts

[Build System: CMake] New stdlib/toolchain directory for toolchain-only content.

Author: Rostepher

CMakeLists.txt

@@ -1078,7 +1078,7 @@ endif()
 if(SWIFT_BUILD_STDLIB)
   add_subdirectory(stdlib)
 else()
-  add_subdirectory(stdlib/public/legacy_layouts)
+  add_subdirectory(stdlib/toolchain)
 
   # Some tools (e.g. swift-reflection-dump) rely on a host swiftReflection, so
   # ensure we build that when building tools.

stdlib/CMakeLists.txt

@@ -136,4 +136,5 @@ swift_create_stdlib_targets("swift-test-stdlib" "" FALSE)
 
 add_subdirectory(public)
 add_subdirectory(private)
+add_subdirectory(toolchain)
 add_subdirectory(tools)

stdlib/public/CMakeLists.txt

@@ -52,7 +52,6 @@ if(CXX_SUPPORTS_DEFAULT_HIDDEN_VISIBILITY)
   list(APPEND SWIFT_RUNTIME_CORE_CXX_FLAGS "-fvisibility=hidden")
 endif()
 
-add_subdirectory(legacy_layouts)
 add_subdirectory(SwiftShims)
 
 if(SWIFT_BUILD_STDLIB)

stdlib/toolchain/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(legacy_layouts)

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

@@ -4,7 +4,7 @@ foreach(sdk ${SWIFT_SDKS})
   foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES})
     set(platform "${SWIFT_SDK_${sdk}_LIB_SUBDIR}")
 
-    set(input "${SWIFT_SOURCE_DIR}/stdlib/public/legacy_layouts/${platform}/layouts-${arch}.yaml")
+    set(input "${SWIFT_SOURCE_DIR}/stdlib/toolchain/legacy_layouts/${platform}/layouts-${arch}.yaml")
     set(output "${SWIFTLIB_DIR}/${platform}/layouts-${arch}.yaml")
 
     set(copy_target "copy-legacy-layouts-${platform}-${arch}")