Skip to content

Commit f21eb53

Browse files
authored
Merge branch 'main' into temp-branch
2 parents ac8d630 + 95dc7df commit f21eb53

File tree

593 files changed

+14924
-7249
lines changed

Some content is hidden

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

593 files changed

+14924
-7249
lines changed

Runtimes/Core/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ add_compile_options(
182182
# frontned and `clang-cl` (and `clang`) currently do not support `/WX:nnnn`. As
183183
# a compromise, treat all linker warnings as errors.
184184
add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
185+
# Ensure all symbols are fully resolved on Linux
186+
add_link_options($<$<PLATFORM_ID:Linux>:LINKER:-z,defs>)
185187

186188
add_compile_options(
187189
$<$<COMPILE_LANGUAGE:Swift>:-explicit-module-build>

Runtimes/Core/Concurrency/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,5 +158,5 @@ emit_swift_interface(swift_Concurrency)
158158
install_swift_interface(swift_Concurrency)
159159

160160
# Configure plist creation for Darwin platforms.
161-
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swift_Concurrency)
161+
generate_plist(swift_Concurrency "${CMAKE_PROJECT_VERSION}" swift_Concurrency)
162162
embed_manifest(swift_Concurrency)

Runtimes/Core/SwiftOnoneSupport/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ emit_swift_interface(swiftSwiftOnoneSupport)
4141
install_swift_interface(swiftSwiftOnoneSupport)
4242

4343
# Configure plist creation for Darwin platforms.
44-
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swiftSwiftOnoneSupport)
44+
generate_plist(swiftSwiftOnoneSupport "${CMAKE_PROJECT_VERSION}" swiftSwiftOnoneSupport)
4545
embed_manifest(swiftSwiftOnoneSupport)

Runtimes/Core/core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ emit_swift_interface(swiftCore)
385385
install_swift_interface(swiftCore)
386386

387387
# Configure plist creation for Darwin platforms.
388-
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swiftCore)
388+
generate_plist(swiftCore "${CMAKE_PROJECT_VERSION}" swiftCore)
389389
embed_manifest(swiftCore)
390390

391391
include("${SwiftCore_VENDOR_MODULE_DIR}/swiftCore.cmake" OPTIONAL)

Runtimes/Overlay/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ include(ExperimentalFeatures)
9494
# frontned and `clang-cl` (and `clang`) currently do not support `/WX:nnnn`. As
9595
# a compromise, treat all linker warnings as errors.
9696
add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
97+
# Ensure all symbols are fully resolved on Linux
98+
add_link_options($<$<PLATFORM_ID:Linux>:LINKER:-z,defs>)
9799

98100
include(ExperimentalFeatures)
99101

Runtimes/Supplemental/Differentiation/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ add_compile_options(
8888
# FIXME(#83444) - enable this once we fix DLL storage for
8989
# `_fatalErrorForwardModeDifferentiationDisabled`
9090
# add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
91+
# Ensure all symbols are fully resolved on Linux
92+
add_link_options($<$<PLATFORM_ID:Linux>:LINKER:-z,defs>)
9193

9294
if(SwiftDifferentiation_ENABLE_VECTOR_TYPES)
9395
gyb_expand(SIMDDifferentiation.swift.gyb SIMDDifferentiation.swift)
@@ -132,7 +134,7 @@ emit_swift_interface(swift_Differentiation)
132134
install_swift_interface(swift_Differentiation)
133135

134136
# Configure plist creation for Darwin platforms.
135-
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swift_Differentiation)
137+
generate_plist(swift_Differentiation "${CMAKE_PROJECT_VERSION}" swift_Differentiation)
136138
embed_manifest(swift_Differentiation)
137139

138140
include("${${PROJECT_NAME}_VENDOR_MODULE_DIR}/swift_Differentiation.cmake" OPTIONAL)

Runtimes/Supplemental/Distributed/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ add_compile_options(
9898
# frontned and `clang-cl` (and `clang`) currently do not support `/WX:nnnn`. As
9999
# a compromise, treat all linker warnings as errors.
100100
add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
101+
# Ensure all symbols are fully resolved on Linux
102+
add_link_options($<$<PLATFORM_ID:Linux>:LINKER:-z,defs>)
101103

102104
add_library(swiftDistributed
103105
DistributedActor.cpp
@@ -155,7 +157,7 @@ emit_swift_interface(swiftDistributed)
155157
install_swift_interface(swiftDistributed)
156158

157159
# Configure plist creation for Darwin platforms.
158-
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swiftDistributed)
160+
generate_plist(swiftDistributed "${CMAKE_PROJECT_VERSION}" swiftDistributed)
159161
embed_manifest(swiftDistributed)
160162

161163
include("${${PROJECT_NAME}_VENDOR_MODULE_DIR}/swiftDistributed.cmake" OPTIONAL)

Runtimes/Supplemental/Observation/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ add_compile_options(
8383
# frontned and `clang-cl` (and `clang`) currently do not support `/WX:nnnn`. As
8484
# a compromise, treat all linker warnings as errors.
8585
add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
86+
# Ensure all symbols are fully resolved on Linux
87+
add_link_options($<$<PLATFORM_ID:Linux>:LINKER:-z,defs>)
8688

8789
add_library(swiftObservation
8890
Sources/Observation/Locking.swift
@@ -119,7 +121,7 @@ emit_swift_interface(swiftObservation)
119121
install_swift_interface(swiftObservation)
120122

121123
# Configure plist creation for Darwin platforms.
122-
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swiftObservation)
124+
generate_plist(swiftObservation "${CMAKE_PROJECT_VERSION}" swiftObservation)
123125
embed_manifest(swiftObservation)
124126

125127
include("${${PROJECT_NAME}_VENDOR_MODULE_DIR}/swiftObservation.cmake" OPTIONAL)

Runtimes/Supplemental/StringProcessing/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ add_compile_options(
6565
# frontned and `clang-cl` (and `clang`) currently do not support `/WX:nnnn`. As
6666
# a compromise, treat all linker warnings as errors.
6767
add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
68+
# Ensure all symbols are fully resolved on Linux
69+
add_link_options($<$<PLATFORM_ID:Linux>:LINKER:-z,defs>)
6870

6971
add_subdirectory(_RegexParser)
7072
add_subdirectory(_StringProcessing)

Runtimes/Supplemental/Synchronization/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ add_compile_options(
101101
# frontned and `clang-cl` (and `clang`) currently do not support `/WX:nnnn`. As
102102
# a compromise, treat all linker warnings as errors.
103103
add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
104+
# Ensure all symbols are fully resolved on Linux
105+
add_link_options($<$<PLATFORM_ID:Linux>:LINKER:-z,defs>)
104106

105107
gyb_expand(Atomics/AtomicIntegers.swift.gyb Atomics/AtomicIntegers.swift)
106108
gyb_expand(Atomics/AtomicStorage.swift.gyb Atomics/AtomicStorage.swift)
@@ -190,7 +192,7 @@ emit_swift_interface(swiftSynchronization)
190192
install_swift_interface(swiftSynchronization)
191193

192194
# Configure plist creation for Darwin platforms.
193-
generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swiftSynchronization)
195+
generate_plist(swiftSynchronization "${CMAKE_PROJECT_VERSION}" swiftSynchronization)
194196
embed_manifest(swiftSynchronization)
195197

196198
include("${${PROJECT_NAME}_VENDOR_MODULE_DIR}/swiftSynchronization.cmake" OPTIONAL)

0 commit comments

Comments
 (0)