Skip to content

Commit daf06a7

Browse files
authored
Merge pull request #26362 from Rostepher/install-ordering-matters
[Build System: CMake] Include the stdlib/toolchain directory before the stdlib/public directory.
2 parents 6e50c51 + 28e90d6 commit daf06a7

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
@@ -139,7 +139,9 @@ if(SWIFT_STDLIB_ENABLE_SIB_TARGETS)
139139
endif()
140140
swift_create_stdlib_targets("swift-test-stdlib" "" FALSE)
141141

142+
# FIXME: Include the toolchain directory before the public directory. Otherwise
143+
# the clang resource directory symlink stops installing correctly.
144+
add_subdirectory(toolchain)
142145
add_subdirectory(public)
143146
add_subdirectory(private)
144-
add_subdirectory(toolchain)
145147
add_subdirectory(tools)

0 commit comments

Comments
 (0)