Skip to content

Replace a cmake option with a preprocessor macro. #7469

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
Mar 3, 2017

Conversation

bob-wilson
Copy link
Contributor

When moving to the swift-4.0-branch of LLVM, we started using the
LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING cmake option to turn off those
checks. This was necessary for the stdlib build, where it uses some LLVM
headers without linking libSupport.a, but the cmake option forced us to
disable the checks across the board. It also caused a lot of churn for
people who needed to remove their cmake caches when switching to the new
version of LLVM. This change switches to use a preprocessor macro to
disable the checks only in the context of the stdlib build. It requires
LLVM r295090. rdar://problem/30098953

When moving to the swift-4.0-branch of LLVM, we started using the
LLVM_DISABLE_ABI_BREAKING_CHECKS_ENFORCING cmake option to turn off those
checks. This was necessary for the stdlib build, where it uses some LLVM
headers without linking libSupport.a, but the cmake option forced us to
disable the checks across the board. It also caused a lot of churn for
people who needed to remove their cmake caches when switching to the new
version of LLVM. This change switches to use a preprocessor macro to
disable the checks only in the context of the stdlib build. It requires
LLVM r295090. rdar://problem/30098953
@bob-wilson
Copy link
Contributor Author

I need to hold onto this until the LLVM change propagates to the stable branch.

@bob-wilson
Copy link
Contributor Author

@swift-ci please test

@bob-wilson
Copy link
Contributor Author

I'm going to hold this for a bit longer to make it more likely that people will have updated their LLVM builds and will not be impacted by this.

@bob-wilson
Copy link
Contributor Author

I'm planning to merge this tomorrow (Friday). I sent a heads-up message to swift-dev.

@bob-wilson bob-wilson merged commit 2c44ad4 into swiftlang:master Mar 3, 2017
@bob-wilson bob-wilson deleted the disable-checks-macro branch March 3, 2017 15:48
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.

1 participant