Skip to content

Commit a69e6f9

Browse files
committed
[embedded] Avoid passing -D__APPLE__ on Linux builds
1 parent 971ad79 commit a69e6f9

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

stdlib/public/Concurrency/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,14 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
202202
if(NOT "${mod}" MATCHES "-linux-gnu$")
203203
continue()
204204
endif()
205+
set(extra_c_compile_flags)
206+
set(extra_swift_compile_flags)
205207
elseif (SWIFT_HOST_VARIANT STREQUAL "macosx")
206208
if(NOT "${mod}" MATCHES "-macos$")
207209
continue()
208210
endif()
211+
set(extra_c_compile_flags -D__MACH__ -D__APPLE__ -ffreestanding)
212+
set(extra_swift_compile_flags -Xcc -D__MACH__ -Xcc -D__APPLE__ -Xcc -ffreestanding)
209213
endif()
210214

211215
set(SWIFT_SDK_embedded_ARCH_${mod}_MODULE "${mod}")
@@ -247,12 +251,11 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
247251
TaskCancellation.swift
248252

249253
SWIFT_COMPILE_FLAGS
250-
-Xcc -D__MACH__ -Xcc -D__APPLE__ -Xcc -ffreestanding -enable-experimental-feature Embedded
254+
${extra_swift_compile_flags} -enable-experimental-feature Embedded
251255
-parse-stdlib -DSWIFT_CONCURRENCY_EMBEDDED
252256
${SWIFT_RUNTIME_CONCURRENCY_SWIFT_FLAGS}
253257
C_COMPILE_FLAGS
254-
-D__MACH__ -D__APPLE__ -ffreestanding
255-
${SWIFT_RUNTIME_CONCURRENCY_C_FLAGS} -DSWIFT_CONCURRENCY_EMBEDDED=1
258+
${extra_c_compile_flags} ${SWIFT_RUNTIME_CONCURRENCY_C_FLAGS} -DSWIFT_CONCURRENCY_EMBEDDED=1
256259
MODULE_DIR "${CMAKE_BINARY_DIR}/lib/swift/embedded"
257260
SDK "embedded"
258261
ARCHITECTURE "${mod}"

0 commit comments

Comments
 (0)