Skip to content

Commit c2a0d16

Browse files
committed
build: Don't link against libatomic on Linux
The dependency on libatomic was removed in 97df90f. This commit removes leftover cases that still link against libatomic.
1 parent 17472cc commit c2a0d16

File tree

4 files changed

+0
-9
lines changed

4 files changed

+0
-9
lines changed

unittests/runtime/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
5050
${FOUNDATION_LIBRARY}
5151
swiftStdlibUnittest${SWIFT_PRIMARY_VARIANT_SUFFIX}
5252
)
53-
elseif(SWIFT_HOST_VARIANT STREQUAL "linux")
54-
list(APPEND PLATFORM_TARGET_LINK_LIBRARIES "atomic")
5553
elseif(SWIFT_HOST_VARIANT STREQUAL "freebsd")
5654
find_library(EXECINFO_LIBRARY execinfo)
5755
list(APPEND PLATFORM_TARGET_LINK_LIBRARIES

unittests/runtime/LongTests/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND
1919

2020
# Link the Objective-C runtime.
2121
list(APPEND PLATFORM_TARGET_LINK_LIBRARIES "objc")
22-
elseif(SWIFT_HOST_VARIANT STREQUAL "linux")
23-
list(APPEND PLATFORM_TARGET_LINK_LIBRARIES
24-
"atomic"
25-
)
2622
elseif(SWIFT_HOST_VARIANT STREQUAL "freebsd")
2723
find_library(EXECINFO_LIBRARY execinfo)
2824
list(APPEND PLATFORM_TARGET_LINK_LIBRARIES

utils/gen-static-stdlib-link-args

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ function write_linkfile {
6161
cat >$OUTPUTFILE <<EOF
6262
-ldl
6363
-lpthread
64-
-latomic
6564
-lswiftCore
66-
-latomic
6765
-lswiftImageInspectionShared
6866
$ICU_LIBS
6967
-lstdc++

utils/static-executable-args.lnk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
-Xlinker
99
--defsym=__import_pthread_key_create=pthread_key_create
1010
-lpthread
11-
-latomic
1211
-licui18n
1312
-licuuc
1413
-licudata

0 commit comments

Comments
 (0)