Skip to content

Conversation

kateinoigakukun
Copy link
Member

This is a follow up to 5e7281b, which just adds the BUILD_TOOLS option but doesn't actually use it.

@kateinoigakukun
Copy link
Member Author

@swift-ci test

@MaxDesiatov MaxDesiatov added bug WASI WebAssembly System Interface-related changes labels Feb 7, 2024
@@ -2,4 +2,6 @@ add_subdirectory(UUID)
add_subdirectory(Foundation)
add_subdirectory(FoundationNetworking)
add_subdirectory(FoundationXML)
add_subdirectory(Tools)
if(BUILD_TOOLS)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not a standard CMake flag. Can you create a proper option for this for something like FOUNDATION_BUILD_TOOLS? We can control the default for it to disable it by default on WASM targets if desired.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The option is already declared here as option https://github.com/apple/swift-corelibs-foundation/blob/7f62c8c52aeed9a86b503fe7b662c48eda5d0f8a/CMakeLists.txt#L43 but I agree the option name should be prefixed by FOUNDATION

This is a follow up to 5e7281b, which
just adds the `BUILD_TOOLS` option but doesn't actually use it. This
patch renames the option to follow the CMake conventions and uses it to
actually exclude the tools from the build.
@kateinoigakukun kateinoigakukun force-pushed the pr-972effe45a04043fc1aba1eaa9209ac85b3f9c85 branch from 56330a7 to 004a9dd Compare February 22, 2024 04:21
@kateinoigakukun
Copy link
Member Author

@swift-ci test

@MaxDesiatov
Copy link
Contributor

@swift-ci test windows

@MaxDesiatov MaxDesiatov changed the title [wasm][build] Exclude Tools from build when BUILD_TOOLS is OFF [wasm][build] Handle FOUNDATION_BUILD_TOOLS value set to OFF Feb 22, 2024
@MaxDesiatov
Copy link
Contributor

@swift-ci test windows

@kateinoigakukun kateinoigakukun merged commit c890a55 into swiftlang:main Feb 22, 2024
@kateinoigakukun kateinoigakukun deleted the pr-972effe45a04043fc1aba1eaa9209ac85b3f9c85 branch February 22, 2024 18:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug WASI WebAssembly System Interface-related changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants