Skip to content

Commit 83ec6ff

Browse files
committed
---
yaml --- r: 348113 b: refs/heads/master c: 5e5f662 h: refs/heads/master i: 348111: 88d91f3
1 parent 5b71b64 commit 83ec6ff

Some content is hidden

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

44 files changed

+5824
-3514
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 6c252ae22805f62ca0086372de8f2dff58654f3b
2+
refs/heads/master: 5e5f662fb7ab1a342a34efed579e590bb3097db7
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/cmake/modules/AddSwift.cmake

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,12 @@ function(_add_variant_link_flags)
517517
NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WINDOWS"))
518518
list(APPEND result "-fuse-ld=lld")
519519
elseif(SWIFT_ENABLE_GOLD_LINKER AND
520-
"${SWIFT_SDK_${LFLAGS_SDK}_OBJECT_FORMAT}" STREQUAL "ELF")
521-
list(APPEND result "-fuse-ld=gold")
520+
"${SWIFT_SDK_${LFLAGS_SDK}_OBJECT_FORMAT}" STREQUAL "ELF")
521+
if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
522+
list(APPEND result "-fuse-ld=gold.exe")
523+
else()
524+
list(APPEND result "-fuse-ld=gold")
525+
endif()
522526
endif()
523527
endif()
524528

0 commit comments

Comments
 (0)