Skip to content

Commit a0fca3a

Browse files
gottesmmgottesmm
authored
Merge pull request #3965 from gottesmm/support_per_host_cmake_and_tsan_of_runtime_via_buildscript
Support per host cmake and tsan of runtime via buildscript
2 parents 94cab7f + 06a70d3 commit a0fca3a

File tree

46 files changed

+268
-13
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+268
-13
lines changed

‎cmake/modules/AddSwiftUnittests.cmake

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,16 @@ function(add_swift_unittest test_dirname)
5858
set_property(TARGET "${test_dirname}" APPEND_STRING PROPERTY
5959
LINK_FLAGS " -fprofile-instr-generate -fcoverage-mapping")
6060
endif()
61+
62+
if(SWIFT_RUNTIME_USE_SANITIZERS)
63+
list(FIND SWIFT_RUNTIME_USE_SANITIZERS "Thread" THREAD_INDEX)
64+
if(NOT THREAD_INDEX EQUAL -1)
65+
set_property(TARGET "${test_dirname}" APPEND_STRING PROPERTY COMPILE_FLAGS
66+
" -fsanitize=thread")
67+
set_property(TARGET "${test_dirname}" APPEND_STRING PROPERTY
68+
LINK_FLAGS " -fsanitize=thread")
69+
endif()
70+
endif()
6171
endfunction()
6272

6373

‎stdlib/public/CMakeLists.txt

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,43 @@
11
# C++ code in the runtime and standard library should generally avoid
22
# introducing static constructors or destructors.
3-
set(SWIFT_CORE_CXX_FLAGS)
3+
set(SWIFT_RUNTIME_CXX_FLAGS)
4+
set(SWIFT_RUNTIME_LINK_FLAGS)
5+
set(SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS)
6+
set(SWIFT_RUNTIME_SWIFT_LINK_FLAGS)
7+
8+
if(SWIFT_RUNTIME_USE_SANITIZERS)
9+
# TODO: Refactor this
10+
list(FIND SWIFT_RUNTIME_USE_SANITIZERS "Thread" THREAD_INDEX)
11+
if (NOT THREAD_INDEX EQUAL -1)
12+
list(APPEND SWIFT_RUNTIME_CXX_FLAGS "-fsanitize=thread")
13+
list(APPEND SWIFT_RUNTIME_LINK_FLAGS "-fsanitize=thread")
14+
list(APPEND SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS "-sanitize=thread")
15+
list(APPEND SWIFT_RUNTIME_SWIFT_LINK_FLAGS "-fsanitize=thread")
16+
endif()
17+
endif()
18+
19+
set(SWIFT_RUNTIME_CORE_CXX_FLAGS "${SWIFT_RUNTIME_CXX_FLAGS}")
20+
set(SWIFT_RUNTIME_CORE_LINK_FLAGS "${SWIFT_RUNTIME_LINK_FLAGS}")
421

522
if(CMAKE_SYSTEM_NAME STREQUAL "CYGWIN")
6-
list(APPEND SWIFT_CORE_CXX_FLAGS "-mcmodel=large")
23+
list(APPEND SWIFT_RUNTIME_CORE_CXX_FLAGS "-mcmodel=large")
724
endif()
825

926
check_cxx_compiler_flag("-Werror -Wglobal-constructors" CXX_SUPPORTS_GLOBAL_CONSTRUCTORS_WARNING)
1027
if(CXX_SUPPORTS_GLOBAL_CONSTRUCTORS_WARNING)
11-
list(APPEND SWIFT_CORE_CXX_FLAGS "-Wglobal-constructors")
28+
list(APPEND SWIFT_RUNTIME_CORE_CXX_FLAGS "-Wglobal-constructors")
1229
endif()
1330

1431
check_cxx_compiler_flag("-Wexit-time-destructors" CXX_SUPPORTS_EXIT_TIME_DESTRUCTORS_WARNING)
1532
if(CXX_SUPPORTS_EXIT_TIME_DESTRUCTORS_WARNING)
16-
list(APPEND SWIFT_CORE_CXX_FLAGS "-Wexit-time-destructors")
33+
list(APPEND SWIFT_RUNTIME_CORE_CXX_FLAGS "-Wexit-time-destructors")
1734
endif()
1835

1936
# We don't want runtime C++ code to export symbols we didn't explicitly
2037
# choose to.
2138
check_cxx_compiler_flag("-fvisibility=hidden" CXX_SUPPORTS_DEFAULT_HIDDEN_VISIBILITY)
2239
if(CXX_SUPPORTS_DEFAULT_HIDDEN_VISIBILITY)
23-
list(APPEND SWIFT_CORE_CXX_FLAGS "-fvisibility=hidden")
40+
list(APPEND SWIFT_RUNTIME_CORE_CXX_FLAGS "-fvisibility=hidden")
2441
endif()
2542

2643
if(SWIFT_BUILD_STDLIB)

‎stdlib/public/Platform/CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,26 @@ add_swift_library(swiftDarwin ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
1212
POSIXError.swift
1313
MachError.swift
1414

15-
SWIFT_COMPILE_FLAGS -Xfrontend -disable-objc-attr-requires-foundation-module
15+
SWIFT_COMPILE_FLAGS -Xfrontend -disable-objc-attr-requires-foundation-module "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
16+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
1617
TARGET_SDKS IOS IOS_SIMULATOR OSX TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
1718
API_NOTES_NON_OVERLAY)
1819

1920
add_swift_library(swiftGlibc ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
2021
Glibc.swift
2122
${swift_platform_sources}
23+
24+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
25+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
2226
TARGET_SDKS ANDROID CYGWIN FREEBSD LINUX
2327
DEPENDS glibc_modulemap)
2428

2529
add_swift_library(swiftMSVCRT ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
2630
msvcrt.swift
2731
${swift_platform_sources}
32+
33+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
34+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
2835
TARGET_SDKS WINDOWS)
2936

3037
set(glibc_modulemap_target_list)

‎stdlib/public/Reflection/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@ add_swift_library(swiftReflection STATIC TARGET_LIBRARY FORCE_BUILD_FOR_HOST_SDK
55
TypeLowering.cpp
66
TypeRef.cpp
77
TypeRefBuilder.cpp
8+
9+
C_COMPILE_FLAGS ${SWIFT_RUNTIME_CXX_FLAGS}
10+
LINK_FLAGS ${SWIFT_RUNTIME_LINK_FLAGS}
811
INSTALL_IN_COMPONENT dev)

‎stdlib/public/SDK/AVFoundation/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
add_swift_library(swiftAVFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
AVFoundation.swift
33
TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
4+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
5+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
46
SWIFT_MODULE_DEPENDS Foundation CoreMedia
57
SWIFT_MODULE_DEPENDS_OSX AppKit
68
FRAMEWORK_DEPENDS AVFoundation)

‎stdlib/public/SDK/AppKit/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ add_swift_library(swiftAppKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OV
22
AppKit.swift
33
AppKit_FoundationExtensions.swift
44
NSError.swift
5+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
6+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
57
TARGET_SDKS OSX
68
SWIFT_MODULE_DEPENDS ObjectiveC Foundation CoreData CoreImage
79
FRAMEWORK_DEPENDS AppKit)

‎stdlib/public/SDK/AssetsLibrary/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
add_swift_library(swiftAssetsLibrary ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
AssetsLibrary.swift
3+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
4+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
35
TARGET_SDKS IOS IOS_SIMULATOR
46
SWIFT_MODULE_DEPENDS ObjectiveC Foundation CoreGraphics
57
FRAMEWORK_DEPENDS AssetsLibrary)

‎stdlib/public/SDK/CallKit/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ add_swift_library(swiftCallKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_O
22
CallKit.swift
33
CXProviderConfiguration.swift
44

5+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
6+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
57
TARGET_SDKS IOS IOS_SIMULATOR
68
SWIFT_MODULE_DEPENDS Foundation
79
FRAMEWORK_DEPENDS_WEAK CallKit)

‎stdlib/public/SDK/CloudKit/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
add_swift_library(swiftCloudKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
CloudKit.swift
3+
4+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
5+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
36
TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
47
SWIFT_MODULE_DEPENDS Foundation CoreLocation
58
SWIFT_MODULE_DEPENDS_OSX Contacts

‎stdlib/public/SDK/Contacts/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
add_swift_library(swiftContacts ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
Contacts.swift
3+
4+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
5+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
36
TARGET_SDKS OSX IOS IOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
47
SWIFT_MODULE_DEPENDS Foundation
58
FRAMEWORK_DEPENDS_WEAK Contacts)

‎stdlib/public/SDK/CoreAudio/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ add_swift_library(swiftCoreAudio ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK
22
CoreAudio.swift
33
../../../public/core/WriteBackMutableSlice.swift
44

5+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
6+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
57
TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
68
SWIFT_MODULE_DEPENDS Dispatch
79
SWIFT_MODULE_DEPENDS_OSX IOKit

‎stdlib/public/SDK/CoreData/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ add_swift_library(swiftCoreData ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_
22
CoreData.swift
33
CoreData.mm
44

5+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
6+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
57
SWIFT_MODULE_DEPENDS Foundation
68
FRAMEWORK_DEPENDS CoreData)
79

‎stdlib/public/SDK/CoreGraphics/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ add_swift_library(swiftCoreGraphics ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_
44
Private.swift
55
# rdar://problem/20891746
66
# SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL}
7+
8+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
9+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
710
SWIFT_MODULE_DEPENDS ObjectiveC Dispatch Darwin
811
SWIFT_MODULE_DEPENDS_OSX IOKit XPC
912
FRAMEWORK_DEPENDS CoreGraphics)

‎stdlib/public/SDK/CoreImage/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
add_swift_library(swiftCoreImage ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
CoreImage.swift
33

4+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
5+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
46
TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
57
SWIFT_MODULE_DEPENDS Foundation ObjectiveC
68
SWIFT_MODULE_DEPENDS_IOS CoreMedia

‎stdlib/public/SDK/CoreLocation/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
add_swift_library(swiftCoreLocation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
CoreLocation.swift
3+
4+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
5+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
36
SWIFT_MODULE_DEPENDS Foundation
47
FRAMEWORK_DEPENDS CoreLocation)

‎stdlib/public/SDK/CoreMedia/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ add_swift_library(swiftCoreMedia ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK
33
CMTime.swift
44
CMTimeRange.swift
55

6+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
7+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
68
TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
79
SWIFT_MODULE_DEPENDS Dispatch CoreAudio CoreGraphics Foundation
810
SWIFT_MODULE_DEPENDS_OSX AppKit

‎stdlib/public/SDK/CryptoTokenKit/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
add_swift_library(swiftCryptoTokenKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
CryptoTokenKit.swift
33

4+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
5+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
46
TARGET_SDKS OSX
57
SWIFT_MODULE_DEPENDS Foundation
68
FRAMEWORK_DEPENDS CryptoTokenKit)

‎stdlib/public/SDK/Dispatch/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ add_swift_library(swiftDispatch ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_
99
Queue.swift
1010
Source.swift
1111
Time.swift
12+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
13+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
1214
SWIFT_MODULE_DEPENDS ObjectiveC)

‎stdlib/public/SDK/Foundation/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ add_swift_library(swiftFoundation ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SD
3737
Hashing.m
3838
Thunks.mm
3939

40+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
41+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
4042
SWIFT_MODULE_DEPENDS ObjectiveC CoreGraphics Dispatch os
4143
SWIFT_MODULE_DEPENDS_OSX XPC
4244
FRAMEWORK_DEPENDS Foundation)

‎stdlib/public/SDK/GLKit/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
add_swift_library(swiftGLKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
GLKit.swift.gyb
33

4+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
5+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
46
TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
57
SWIFT_MODULE_DEPENDS Foundation simd
68
SWIFT_MODULE_DEPENDS_OSX AppKit

‎stdlib/public/SDK/GameplayKit/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ add_swift_library(swiftGameplayKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_S
22
GameplayKit.swift
33
GameplayKit.mm
44

5+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
6+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
57
TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
68
SWIFT_MODULE_DEPENDS Foundation simd GLKit SpriteKit
79
FRAMEWORK_DEPENDS_WEAK GameplayKit)

‎stdlib/public/SDK/HomeKit/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
add_swift_library(swiftHomeKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
HomeKit.swift
3+
4+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
5+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
36
TARGET_SDKS IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
47
SWIFT_MODULE_DEPENDS Foundation
58
SWIFT_MODULE_DEPENDS_IOS UIKit

‎stdlib/public/SDK/IOKit/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
add_swift_library(swiftIOKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
IOKit.swift
3+
4+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
5+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
36
TARGET_SDKS OSX
47
SWIFT_MODULE_DEPENDS ObjectiveC Dispatch
58
FRAMEWORK_DEPENDS IOKit)

‎stdlib/public/SDK/Intents/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ add_swift_library(swiftIntents ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_O
1414
INStartPhotoPlaybackIntentResponse.swift
1515
INStartWorkoutIntent.swift
1616

17+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
18+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
1719
TARGET_SDKS OSX IOS IOS_SIMULATOR
1820
SWIFT_MODULE_DEPENDS Foundation CoreLocation
1921
SWIFT_MODULE_DEPENDS_OSX AppKit

‎stdlib/public/SDK/ObjectiveC/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
add_swift_library(swiftObjectiveC ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
ObjectiveC.mm
33
ObjectiveC.swift
4+
5+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
6+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
47
SWIFT_MODULE_DEPENDS Darwin)
58

‎stdlib/public/SDK/OpenCL/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
add_swift_library(swiftOpenCL ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
OpenCL.swift
3+
4+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
5+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
36
TARGET_SDKS OSX
47
SWIFT_MODULE_DEPENDS Dispatch Darwin # also, IOSurface
58
FRAMEWORK_DEPENDS OpenCL)

‎stdlib/public/SDK/Photos/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
add_swift_library(swiftPhotos ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
Photos.swift
33

4+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
5+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
46
TARGET_SDKS IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
57
SWIFT_MODULE_DEPENDS Foundation CoreLocation CoreImage CoreMedia
68
SWIFT_MODULE_DEPENDS_IOS UIKit AVFoundation

‎stdlib/public/SDK/SafariServices/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ add_swift_library(swiftSafariServices ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} I
22
SafariServices.mm
33
SafariServices.swift
44

5+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
6+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
57
TARGET_SDKS OSX
68
SWIFT_MODULE_DEPENDS Foundation AppKit
79
FRAMEWORK_DEPENDS_WEAK SafariServices)

‎stdlib/public/SDK/SceneKit/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ add_swift_library(swiftSceneKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_
88
SceneKit.swift
99
Thunks.mm
1010

11+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
12+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
1113
TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
1214
SWIFT_MODULE_DEPENDS_OSX ${SWIFT_SCENEKIT_DEPENDENCIES_NON_WATCHOS} AppKit
1315
SWIFT_MODULE_DEPENDS_IOS ${SWIFT_SCENEKIT_DEPENDENCIES_NON_WATCHOS} UIKit

‎stdlib/public/SDK/SpriteKit/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ add_swift_library(swiftSpriteKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK
22
SpriteKit.swift
33
SpriteKitQuickLooks.swift.gyb
44

5+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
6+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
57
TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
68
SWIFT_MODULE_DEPENDS Foundation simd
79
SWIFT_MODULE_DEPENDS_OSX AppKit GLKit

‎stdlib/public/SDK/UIKit/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ add_swift_library(swiftUIKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVE
22
DesignatedInitializers.mm
33
UIKit.swift
44
UIKit_FoundationExtensions.swift
5+
6+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
7+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
58
TARGET_SDKS IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
69
SWIFT_MODULE_DEPENDS ObjectiveC Foundation
710
SWIFT_MODULE_DEPENDS_IOS CoreImage

‎stdlib/public/SDK/WatchKit/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
add_swift_library(swiftWatchKit ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
WatchKit.swift
3+
4+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
5+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
36
TARGET_SDKS IOS IOS_SIMULATOR WATCHOS WATCHOS_SIMULATOR
47
SWIFT_MODULE_DEPENDS Foundation UIKit CoreGraphics
58
SWIFT_MODULE_DEPENDS_WATCHOS HomeKit SceneKit

‎stdlib/public/SDK/XCTest/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ set(DISABLE_APPLICATION_EXTENSION ON)
33
add_swift_library(swiftXCTest ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
44
XCTestCaseAdditions.mm
55
XCTest.swift
6+
7+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
8+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
69
TARGET_SDKS OSX IOS IOS_SIMULATOR TVOS TVOS_SIMULATOR
710
SWIFT_MODULE_DEPENDS ObjectiveC Foundation
811
FRAMEWORK_DEPENDS Foundation XCTest

‎stdlib/public/SDK/XPC/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
add_swift_library(swiftXPC ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
XPC.swift
33
XPC.mm
4+
5+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
6+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
47
TARGET_SDKS OSX
58
SWIFT_MODULE_DEPENDS ObjectiveC Dispatch)

‎stdlib/public/SDK/os/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
add_swift_library(swiftos ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
os.swift
33
os.mm
4+
5+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
6+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
47
SWIFT_MODULE_DEPENDS ObjectiveC Dispatch
58
SWIFT_MODULE_DEPENDS_OSX XPC)

‎stdlib/public/SDK/simd/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
add_swift_library(swiftsimd ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
22
simd.swift.gyb
33

4+
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
5+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
46
SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL} -parse-stdlib
57
SWIFT_MODULE_DEPENDS Darwin)

‎stdlib/public/SwiftOnoneSupport/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ add_swift_library(swiftSwiftOnoneSupport ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_
22
# This file should be listed the first. Module name is inferred from the
33
# filename.
44
SwiftOnoneSupport.swift
5-
SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL} "-parse-stdlib"
5+
SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL} "-parse-stdlib" "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
6+
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
67
INSTALL_IN_COMPONENT stdlib)

0 commit comments

Comments
 (0)