build: explicitly link tests to swiftCore swiftOnoneSupport #307
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
|
@swift-ci please test |
MadCoder
approved these changes
Sep 25, 2017
compnerd
force-pushed
the
swift-tests
branch
2 times, most recently
from
108b59d to
19fbcb0
Compare
gottesmm
reviewed
Oct 1, 2017
CMakeLists.txt
Outdated
| @@ -33,7 +33,32 @@ dispatch_common_warnings() | |||
| option(ENABLE_DISPATCH_INIT_CONSTRUCTOR "enable libdispatch_init as a constructor" ON) | |||
| set(USE_LIBDISPATCH_INIT_CONSTRUCTOR ${ENABLE_DISPATCH_INIT_CONSTRUCTOR}) | |||
|
|
|||
| # TODO(compnerd) swift options | |||
| option(ENABLE_SWIFT "enable libdispatch swift overlay" OFF) | |||
| if(ENABLE_SWIFFT) | |||
There was a problem hiding this comment.
This looks like a typo. ENABLE_SWIFFT => ENABLE_SWIFT. I didn't read anything else though so don't take this as a "true" review.
|
On Oct 1, 2017, at 11:50 AM, Saleem Abdulrasool ***@***.***> wrote:
@compnerd commented on this pull request.
In CMakeLists.txt <#307 (comment)>:
> @@ -33,7 +33,32 @@ dispatch_common_warnings()
option(ENABLE_DISPATCH_INIT_CONSTRUCTOR "enable libdispatch_init as a constructor" ON)
set(USE_LIBDISPATCH_INIT_CONSTRUCTOR ${ENABLE_DISPATCH_INIT_CONSTRUCTOR})
-# TODO(compnerd) swift options
+option(ENABLE_SWIFT "enable libdispatch swift overlay" OFF)
+if(ENABLE_SWIFFT)
Nice catch.
Just doing my job ; )
… —
You are receiving this because you commented.
Reply to this email directly, view it on GitHub <#307 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAee3zvYmK-U7GL5Ybtzo6OYl3eYOXmPks5sn97xgaJpZM4PjDZD>.
|
Add explicit links against the swift runtime for the tests which may use the swift runtime. This prevents link failures for the swift tests. Install the swiftmodule and swiftdoc into the installed image. Correct the modulemap installation. Fix a typo in the header installation.
|
Can we get this merged? This is holding up a sizable change at swiftlang/swift#12098 and also improves the swift build of libdispatch as well as fixes the installation. |
|
sorry I had forgotten about it. the new changes look fine, let's just test once more it still builds |
|
@swift-ci please test |
|
@MadCoder could you merge this please? I don't have merge rights on libdispatch. |
|
I merged. |
ktopley-apple
pushed a commit
that referenced
this pull request
Dec 6, 2018
build: explicitly link tests to swiftCore swiftOnoneSupport Signed-off-by: Daniel A. Steffen <dsteffen@apple.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add explicit links against the swift runtime for the tests which may
use the swift runtime. This prevents link failures for the swift tests.