Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Coalesce protocol conformance sections on FreeBSD. #480

Merged
merged 2 commits into from
Dec 13, 2015
Merged

Coalesce protocol conformance sections on FreeBSD. #480

merged 2 commits into from
Dec 13, 2015

Conversation

dcci
Copy link
Member

@dcci dcci commented Dec 13, 2015

This patch allows swiftc compiled binaries to run correctly on FreeBSD.
% ./swiftc hello.swift -o hello
davide@rabbit1:/exps/swift/build/Ninja-ReleaseAssert/swift-freebsd-x86_64/bin
% ./hello
hello
% cat hello.swift
print ("hello")

Special thanks to Dmitri Gribenko who provided help debugging the issue

# conformance sections. This wouldn't be necessary if the link was done by
# the swift binary: rdar://problem/19007002
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR
"${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The continuation line should align with the if( line:

  if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR
     "${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")

@gribozavr
Copy link
Contributor

@dcci LGTM, just a small indentation issue. Please fix and I'll merge.

@gribozavr gribozavr self-assigned this Dec 13, 2015
gribozavr added a commit that referenced this pull request Dec 13, 2015
Coalesce protocol conformance sections on FreeBSD.
@gribozavr gribozavr merged commit 67da5b6 into swiftlang:master Dec 13, 2015
freak4pc pushed a commit to freak4pc/swift that referenced this pull request Sep 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants