Skip to content

Commit e2d6f5a

Browse files
authored
[cmake] Include StdlibOptions when only building toolchain extras. (swiftlang#41942)
In swiftlang#40610 some options were moved into `StdlibOptions.cmake`, but that file is only included from `stdlib/CMakeLists.txt` and `cmake/modules/StandaloneOverlay.cmake`. However, if one does not build neither the dynamic nor the static standard library, but enables building the "toolchain extras" with `SWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENT` `stdlib/CMakeLists.txt` will not be included, but `stdlib/toolchain/CMakeLists.txt` will, which uses a value from `StandardOverlay.cmake` that will not be provided the correct default value and will skip building most of what `SWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENT` used to do.
1 parent 385c7f9 commit e2d6f5a

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

stdlib/toolchain/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Toolchain-only build products
22

33
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../cmake/modules)
4+
include(StdlibOptions)
45
include(AddSwiftStdlib)
56

67
set(CXX_COMPILE_FLAGS)

0 commit comments

Comments
 (0)