Skip to content

build: correct the handling for the static variants #29580

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
Feb 1, 2020

Conversation

compnerd
Copy link
Member

The static variants should use the same flags as the dynamic variants.
We missed the name conversion in the variable computation causing the
static and dynamic builds to diverge.

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

The static variants should use the same flags as the dynamic variants.
We missed the name conversion in the variable computation causing the
static and dynamic builds to diverge.
@compnerd
Copy link
Member Author

preset=buildbot_incremental_linux,tsan-libdispatch-test
@swift-ci Please test with preset Linux Platform

@yln yln self-requested a review February 1, 2020 01:37
Copy link
Contributor

@yln yln left a comment

Choose a reason for hiding this comment

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

Preset isn't green yet, but this at least fixes the missing -DENABLE_SWIFT=OFFoption when building the static variant of libdispatch.

@compnerd
Copy link
Member Author

compnerd commented Feb 1, 2020

@swift-ci please smoke test

@compnerd compnerd merged commit 8beb904 into swiftlang:master Feb 1, 2020
@compnerd compnerd deleted the indirection branch February 1, 2020 05:25
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