Skip to content

CMake: allow to specify a SDK when building a triple for Embedded Swift #84817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −3
Open

CMake: allow to specify a SDK when building a triple for Embedded Swift #84817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions stdlib/public/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,22 +264,31 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND NOT SWIFT_WASI_SYSROOT_PATH)
endif()
endif()

foreach(triple ${SWIFT_EMBEDDED_STDLIB_EXTRA_TARGET_TRIPLES})
if(triple STREQUAL "")
foreach(triple_configuration ${SWIFT_EMBEDDED_STDLIB_EXTRA_TARGET_TRIPLES})
if(triple_configuration STREQUAL "")
continue()
endif()

# Line format: <triple>[@<path to SDK>]
string(REPLACE "@" ";" triple_configuration_list "${triple_configuration}")
list(GET triple_configuration_list 0 triple)
string(REGEX REPLACE "-" ";" list "${triple}")
list(GET list 0 arch)
list(GET list 1 vendor)
list(GET list 2 os)
string(REGEX REPLACE "[0-9]+(\\.[0-9]+)+" " " mod "${triple}")
string(REGEX REPLACE "[0-9]+(\\.[0-9]+)+" "" mod "${triple}")

list(FILTER EMBEDDED_STDLIB_TARGET_TRIPLES EXCLUDE REGEX " ${mod} ")

list(APPEND EMBEDDED_STDLIB_TARGET_TRIPLES
"${arch} ${mod} ${triple}"
)

list(LENGTH triple_configuration_list triple_configuration_list_length)
if(triple_configuration_list_length GREATER_EQUAL 2)
list(GET triple_configuration_list 1 sdk_path)
set(EMBEDDED_STDLIB_SDK_FOR_${triple} "${sdk_path}")
Copy link
Contributor Author

@edymtt edymtt Oct 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

This is causing the failure in Linux and Windows bots, since I am overwriting the values for SWIFT_SDK_embedded_ARCH_wasm32_PATH and SWIFT_SDK_embedded_ARCH_wasm32-unknown-wasip1_PATH that are passed directly to CMake.

[2025-10-10T19:30:49.072Z] FAILED: stdlib/public/Concurrency/CMakeFiles/embedded-concurrency-default-executor-wasm32-unknown-wasip1.dir/CooperativeGlobalExecutor.cpp.o 
[2025-10-10T19:30:49.072Z] /home/build-user/swift-nightly-install/usr/bin/clang++ ...  --sysroot=  ...
[2025-10-10T19:30:49.072Z] clang++: warning: argument unused during compilation: '-fno-semantic-interposition' [-Wunused-command-line-argument]
[2025-10-10T19:30:49.072Z] /home/build-user/swift/stdlib/public/Concurrency/CooperativeGlobalExecutor.cpp:33:10: fatal error: 'chrono' file not found
[2025-10-10T19:30:49.072Z]    33 | #include <chrono>
[2025-10-10T19:30:49.072Z]       |          ^~~~~~~~
[2025-10-10T19:30:49.072Z] 1 error generated.

endif()
endforeach()

if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
Expand Down
1 change: 1 addition & 0 deletions stdlib/public/ClangOverlays/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ if(NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT OR NOT SWIFT_BUILD_
set(SWIFT_SDK_embedded_ARCH_${arch}_MODULE "${mod}")
set(SWIFT_SDK_embedded_LIB_SUBDIR "embedded")
set(SWIFT_SDK_embedded_ARCH_${arch}_TRIPLE "${triple}")
set(SWIFT_SDK_embedded_ARCH_${arch}_PATH "${EMBEDDED_STDLIB_SDK_FOR_${triple}}")
add_swift_target_library_single(
embedded-builtin_float-${mod}
swift_Builtin_float
Expand Down
2 changes: 2 additions & 0 deletions stdlib/public/Concurrency/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,8 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
set(SWIFT_SDK_embedded_LIB_SUBDIR "embedded")
set(SWIFT_SDK_embedded_ARCH_${arch}_TRIPLE "${triple}")
set(SWIFT_SDK_embedded_ARCH_${mod}_TRIPLE "${triple}")
set(SWIFT_SDK_embedded_ARCH_${arch}_PATH "${EMBEDDED_STDLIB_SDK_FOR_${triple}}")
set(SWIFT_SDK_embedded_ARCH_${mod}_PATH "${EMBEDDED_STDLIB_SDK_FOR_${triple}}")

# lib/swift/embedded/_Concurrency.swiftmodule
# lib/swift/embedded/<triple>/libswift_Concurrency.a
Expand Down
1 change: 1 addition & 0 deletions stdlib/public/Synchronization/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
set(SWIFT_SDK_embedded_ARCH_${arch}_MODULE "${mod}")
set(SWIFT_SDK_embedded_LIB_SUBDIR "embedded")
set(SWIFT_SDK_embedded_ARCH_${arch}_TRIPLE "${triple}")
set(SWIFT_SDK_embedded_ARCH_${arch}_PATH "${EMBEDDED_STDLIB_SDK_FOR_${triple}}")
add_swift_target_library_single(
embedded-synchronization-${mod}
swiftSynchronization
Expand Down
1 change: 1 addition & 0 deletions stdlib/public/Volatile/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
set(SWIFT_SDK_embedded_ARCH_${arch}_MODULE "${mod}")
set(SWIFT_SDK_embedded_LIB_SUBDIR "embedded")
set(SWIFT_SDK_embedded_ARCH_${arch}_TRIPLE "${triple}")
set(SWIFT_SDK_embedded_ARCH_${arch}_PATH "${EMBEDDED_STDLIB_SDK_FOR_${triple}}")
add_swift_target_library_single(
embedded-volatile-${mod}
swift_Volatile
Expand Down
1 change: 1 addition & 0 deletions stdlib/public/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,7 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
set(SWIFT_SDK_embedded_ARCH_${arch}_MODULE "${mod}")
set(SWIFT_SDK_embedded_LIB_SUBDIR "embedded")
set(SWIFT_SDK_embedded_ARCH_${arch}_TRIPLE "${triple}")
set(SWIFT_SDK_embedded_ARCH_${arch}_PATH "${EMBEDDED_STDLIB_SDK_FOR_${triple}}")
add_swift_target_library_single(
embedded-stdlib-${mod}
swiftCore
Expand Down
1 change: 1 addition & 0 deletions stdlib/public/stubs/Unicode/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
set(SWIFT_SDK_embedded_ARCH_${mod}_MODULE "${mod}")
set(SWIFT_SDK_embedded_LIB_SUBDIR "embedded")
set(SWIFT_SDK_embedded_ARCH_${mod}_TRIPLE "${triple}")
set(SWIFT_SDK_embedded_ARCH_${mod}_PATH "${EMBEDDED_STDLIB_SDK_FOR_${triple}}")

add_swift_target_library_single(
embedded-unicode-${mod}
Expand Down