Skip to content

Commit e6ae786

Browse files
authored
Merge pull request #26441 from alexshap/linux_compile_flags
2 parents d5d4ac6 + 6febe07 commit e6ae786

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,6 +1697,7 @@ function(add_swift_target_library name)
16971697
SWIFT_COMPILE_FLAGS_OSX
16981698
SWIFT_COMPILE_FLAGS_TVOS
16991699
SWIFT_COMPILE_FLAGS_WATCHOS
1700+
SWIFT_COMPILE_FLAGS_LINUX
17001701
SWIFT_MODULE_DEPENDS
17011702
SWIFT_MODULE_DEPENDS_CYGWIN
17021703
SWIFT_MODULE_DEPENDS_FREEBSD
@@ -1850,6 +1851,9 @@ function(add_swift_target_library name)
18501851
elseif(${sdk} STREQUAL WATCHOS OR ${sdk} STREQUAL WATCHOS_SIMULATOR)
18511852
list(APPEND swiftlib_swift_compile_flags_all
18521853
${SWIFTLIB_SWIFT_COMPILE_FLAGS_WATCHOS})
1854+
elseif(${sdk} STREQUAL LINUX)
1855+
list(APPEND swiftlib_swift_compile_flags_all
1856+
${SWIFTLIB_SWIFT_COMPILE_FLAGS_LINUX})
18531857
elseif(${sdk} STREQUAL WINDOWS)
18541858
# FIXME(SR2005) static and shared are not mutually exclusive; however
18551859
# since we do a single build of the sources, this doesn't work for

stdlib/private/SwiftReflectionTest/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@
22
if (SWIFT_INCLUDE_TESTS)
33
add_swift_target_library(swiftSwiftReflectionTest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
44
SwiftReflectionTest.swift
5-
SWIFT_MODULE_DEPENDS Darwin
6-
TARGET_SDKS ALL_APPLE_PLATFORMS
75
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
6+
SWIFT_COMPILE_FLAGS_LINUX -Xcc -D_GNU_SOURCE
7+
SWIFT_MODULE_DEPENDS_OSX Darwin
8+
SWIFT_MODULE_DEPENDS_IOS Darwin
9+
SWIFT_MODULE_DEPENDS_TVOS Darwin
10+
SWIFT_MODULE_DEPENDS_WATCHOS Darwin
11+
SWIFT_MODULE_DEPENDS_LINUX Glibc
812
INSTALL_IN_COMPONENT stdlib-experimental
913
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
1014

0 commit comments

Comments
 (0)