Skip to content

Commit 6167dd3

Browse files
authored
Merge pull request #26363 from Rostepher/install-ordering-matters-5.1
[Build System: CMake] Include the stdlib/toolchain directory before the stdlib/public directory (5.1 branch).
2 parents 0d7049e + 9d6a67e commit 6167dd3

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

stdlib/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ if(SWIFT_STDLIB_ENABLE_SIB_TARGETS)
113113
endif()
114114
swift_create_stdlib_targets("swift-test-stdlib" "" FALSE)
115115

116+
# FIXME: Include the toolchain directory before the public directory. Otherwise
117+
# the clang resource directory symlink stops installing correctly.
118+
add_subdirectory(toolchain)
116119
add_subdirectory(public)
117120
add_subdirectory(private)
118-
add_subdirectory(toolchain)
119121
add_subdirectory(tools)

0 commit comments

Comments
 (0)