[BuildPlan] Always add -fblocks when compiling C targets #1370
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
(need to update the tests to account for this change, will do if we go ahead with this PR) |
jrose-apple
reviewed
Oct 21, 2017
Sources/Build/BuildPlan.swift
Outdated
| #if os(macOS) | ||
| args += ["-fobjc-arc"] | ||
| #elseif os(Linux) | ||
| args += ["-fblocks"] |
Contributor
There was a problem hiding this comment.
This should probably just be added unconditionally, like -fmodules. It doesn't do any harm on Apple platforms, and it'll be necessary on BSD and Systemz and all the others.
Contributor
There was a problem hiding this comment.
also when cross-compiling to Linux, you definitely want to have -fblocks set.
ddunbar
approved these changes
Oct 21, 2017
Contributor
ddunbar
left a comment
ddunbar
left a comment
There was a problem hiding this comment.
Can we get an integration test that validates this?
aciidgh
force-pushed
the
always-add-blocks-linux
branch
from
352dbd5 to
dbb8e55
Compare
Contributor
Author
|
@swift-ci please smoke test |
<rdar://problem/28109524> [SR-6178]: Pass -fblocks to clang for C language targets Currently, blocks in C libraries will only work if the C target is being imported by a Swift target and that Swift target imports Dispatch. This isn't very optimal but its better than passing -Xcc -fblocks on the command line. This will not cause any issues if the C target is not using blocks. We can track always linking against blocks runtime as an enhancement.
aciidgh
force-pushed
the
always-add-blocks-linux
branch
from
dbb8e55 to
621acf6
Compare
Contributor
Author
|
@swift-ci please smoke test |
Contributor
Author
|
Integration test: swiftlang/swift-integration-tests#25 |
This was referenced Oct 23, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
rdar://problem/28109524 [SR-6178]: Pass -fblocks to clang for C language targets
Currently, blocks in C libraries will only work if the C target is being imported by a Swift target and that Swift target imports Dispatch. This isn't very optimal but its better than passing -Xcc -fblocks on the command line. This will not cause any issues if the C target is not using blocks. We can track always linking against blocks runtime as an enhancement.