Skip to content

Commit 31619c8

Browse files
committed
Runtimes: ensure that all symbols are fully resolved on Android
This ensures that the libraries are properly linked and that we do not have any unresolved symbols in the runtime (which are not satisfied by its module dependencies).
1 parent 2bf3b1f commit 31619c8

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

Runtimes/Core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ add_compile_options(
176176
# a compromise, treat all linker warnings as errors.
177177
add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
178178
# Ensure all symbols are fully resolved on Linux
179-
add_link_options($<$<PLATFORM_ID:Linux>:LINKER:-z,defs>)
179+
add_link_options($<$<PLATFORM_ID:Android,Linux>:LINKER:-z,defs>)
180180

181181
add_compile_options(
182182
$<$<COMPILE_LANGUAGE:Swift>:-explicit-module-build>

Runtimes/Overlay/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ include(ExperimentalFeatures)
8787
# a compromise, treat all linker warnings as errors.
8888
add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
8989
# Ensure all symbols are fully resolved on Linux
90-
add_link_options($<$<PLATFORM_ID:Linux>:LINKER:-z,defs>)
90+
add_link_options($<$<PLATFORM_ID:Android,Linux>:LINKER:-z,defs>)
9191

9292
include(ExperimentalFeatures)
9393

Runtimes/Supplemental/Differentiation/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ add_compile_options(
8989
# `_fatalErrorForwardModeDifferentiationDisabled`
9090
# add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
9191
# Ensure all symbols are fully resolved on Linux
92-
add_link_options($<$<PLATFORM_ID:Linux>:LINKER:-z,defs>)
92+
add_link_options($<$<PLATFORM_ID:Android,Linux>:LINKER:-z,defs>)
9393

9494
if(SwiftDifferentiation_ENABLE_VECTOR_TYPES)
9595
gyb_expand(SIMDDifferentiation.swift.gyb SIMDDifferentiation.swift)

Runtimes/Supplemental/Distributed/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ add_compile_options(
100100
# a compromise, treat all linker warnings as errors.
101101
add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
102102
# Ensure all symbols are fully resolved on Linux
103-
add_link_options($<$<PLATFORM_ID:Linux>:LINKER:-z,defs>)
103+
add_link_options($<$<PLATFORM_ID:Android,Linux>:LINKER:-z,defs>)
104104

105105
add_library(swiftDistributed
106106
DistributedActor.cpp

Runtimes/Supplemental/Observation/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ add_compile_options(
9595
# a compromise, treat all linker warnings as errors.
9696
add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
9797
# Ensure all symbols are fully resolved on Linux
98-
add_link_options($<$<PLATFORM_ID:Linux>:LINKER:-z,defs>)
98+
add_link_options($<$<PLATFORM_ID:Android,Linux>:LINKER:-z,defs>)
9999

100100
add_library(swiftObservation
101101
Sources/Observation/Locking.swift

Runtimes/Supplemental/StringProcessing/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ add_compile_options(
6868
# a compromise, treat all linker warnings as errors.
6969
add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
7070
# Ensure all symbols are fully resolved on Linux
71-
add_link_options($<$<PLATFORM_ID:Linux>:LINKER:-z,defs>)
71+
add_link_options($<$<PLATFORM_ID:Android,Linux>:LINKER:-z,defs>)
7272

7373
add_subdirectory(_RegexParser)
7474
add_subdirectory(_StringProcessing)

Runtimes/Supplemental/Synchronization/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ add_compile_options(
104104
# a compromise, treat all linker warnings as errors.
105105
add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
106106
# Ensure all symbols are fully resolved on Linux
107-
add_link_options($<$<PLATFORM_ID:Linux>:LINKER:-z,defs>)
107+
add_link_options($<$<PLATFORM_ID:Android,Linux>:LINKER:-z,defs>)
108108

109109
gyb_expand(Atomics/AtomicIntegers.swift.gyb Atomics/AtomicIntegers.swift)
110110
gyb_expand(Atomics/AtomicStorage.swift.gyb Atomics/AtomicStorage.swift)

Runtimes/Supplemental/Volatile/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ add_compile_options(
7979
# a compromise, treat all linker warnings as errors.
8080
add_link_options($<$<PLATFORM_ID:Windows>:LINKER:/WX>)
8181
# Ensure all symbols are fully resolved on Linux
82-
add_link_options($<$<PLATFORM_ID:Linux>:LINKER:-z,defs>)
82+
add_link_options($<$<PLATFORM_ID:Android,Linux>:LINKER:-z,defs>)
8383

8484
add_library(swift_Volatile
8585
Volatile.swift)

0 commit comments

Comments
 (0)