Skip to content

[build-script] Propagate libdispatch-cmake-options #26620

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

Merged
merged 1 commit into from
Aug 12, 2019

Conversation

yln
Copy link
Contributor

@yln yln commented Aug 12, 2019

PR #25085 [1] enabled building and installing the static variant of the
libdispatch library in build-script-impl. This broke the
tsan-libdispatch-test preset [2].

Let's make sure we pass along the options specified in
libdispatch-cmake-options when building the static variant.

[1] #25085
[2] #24330

rdar://problem/49177823

PR #25085 [1] enabled building and installing the static variant of the
libdispatch library in build-script-impl. This broke the
`tsan-libdispatch-test` preset [2].

Let's make sure we pass along the options specified in
`libdispatch-cmake-options` when building the static variant.

[1] #25085
[2] #24330

rdar://problem/49177823
@yln yln self-assigned this Aug 12, 2019
@yln
Copy link
Contributor Author

yln commented Aug 12, 2019

@swift-ci Please test

Copy link
Member

@shahmishal shahmishal left a comment

Choose a reason for hiding this comment

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

LGTM!

@yln yln merged commit 806b3bf into master Aug 12, 2019
@yln yln deleted the libdispatch_static_cmake_options_fixup branch August 12, 2019 23:28
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