Fix -latomic linking condition, include android
#38508
Conversation
|
@swift-ci Please test |
| list(APPEND swift_concurrency_link_libraries | ||
| atomic) | ||
| endif() | ||
| if(SWIFT_HOST_VARIANT STREQUAL "linux" OR |
There was a problem hiding this comment.
Was the change from Linux to linux on purpose?
There was a problem hiding this comment.
Yes, SWIFT_HOST_VARIANT seems to generally be lowercase. That's the primary thing this fixes.
There was a problem hiding this comment.
As far as I can tell, the code I copy-and-pasted from is inoperative.
There was a problem hiding this comment.
A shorter way to write this would be SWIFT_HOST_VARIANT MATCHES "linux|android", thanks for adding Android.
There was a problem hiding this comment.
Are the legal values for SWIFT_HOST_VARIANT documented somewhere?
There was a problem hiding this comment.
They are defined here, I count eight possible hosts.
|
Build failed |
rjmccall
force-pushed
the
link-libatomic-concurrency-2
branch
from
3b13066 to
2ff1719
Compare
|
@swift-ci Please test Linux |
|
@swift-ci Please smoke test macOS |
1 similar comment
|
@swift-ci Please smoke test macOS |
#38501 was copy-and-pasting a condition that seems to have been wrong. I've left the original code in place and just fixed this site. I've also removed the architecture conditions — I think this is necessary on all arches — and by @buttaface's request I've added Android to the condition.