Skip to content

Commit 38c0ce5

Browse files
authored
Merge pull request #79055 from kubamracek/embedded-concurrency-libcxx
[embedded] Prepare the Embedded Concurrency library for building on armv7m/armv7em
2 parents 55d5a57 + aea2bb5 commit 38c0ce5

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

stdlib/public/Concurrency/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,13 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
247247
if(NOT "${mod}" MATCHES "-macos$")
248248
continue()
249249
endif()
250-
set(extra_c_compile_flags -D__MACH__ -D__APPLE__ -ffreestanding)
250+
if("${mod}" MATCHES "riscv")
251+
continue()
252+
endif()
253+
if("${mod}" MATCHES "armv6m")
254+
continue()
255+
endif()
256+
set(extra_c_compile_flags -D__MACH__ -D__APPLE__ -ffreestanding -stdlib=libc++)
251257
set(extra_swift_compile_flags -Xcc -D__MACH__ -Xcc -D__APPLE__ -Xcc -ffreestanding)
252258
endif()
253259

0 commit comments

Comments
 (0)