Skip to content

[CMake] Revert recent changes. #7517

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 16, 2017

Conversation

gottesmm
Copy link
Contributor

[CMake] Revert recent changes.

These changes caused a number of issues:

  1. No debug info is emitted when a release-debug info compiler is built.
  2. OS X deployment target specification is broken.
  3. Swift options were broken without any attempt any recreating that
    functionality. The specific option in question is --force-optimized-typechecker.

Such refactorings should be done in a fashion that does not break existing
users and use cases.

This reverts commit e6ce2ff.
This reverts commit e8645f3.
This reverts commit 89b038e.
This reverts commit 497cac6.
This reverts commit 953ad09.
This reverts commit e096d1c.

rdar://30549345

These changes caused a number of issues:

1. No debug info is emitted when a release-debug info compiler is built.
2. OS X deployment target specification is broken.
3. Swift options were broken without any attempt any recreating that
functionality. The specific option in question is --force-optimized-typechecker.

Such refactorings should be done in a fashion that does not break existing
users and use cases.

This reverts commit e6ce2ff.
This reverts commit e8645f3.
This reverts commit 89b038e.
This reverts commit 497cac6.
This reverts commit 953ad09.
This reverts commit e096d1c.

rdar://30549345
@gottesmm
Copy link
Contributor Author

@llvm-beanz I found these issues this evening. I am reverting since issues 1/3 are holding back engineering work. Feel free to recommit once these issues are fixed.

@gottesmm
Copy link
Contributor Author

@swift-ci Please clean smoke test and merge

@swift-ci swift-ci merged commit cca3398 into swiftlang:master Feb 16, 2017
@jrose-apple
Copy link
Contributor

Looks like it also broke the LTO build. @llvm-beanz, I can send you the link to the LTO bot if you want to see how it's configured.

@llvm-beanz
Copy link
Contributor

The broken debug info is caused by an issue I discussed with @gottesmm back in October. Swift's build-script handles the CMAKE_${LANG}_FLAGS_${BUILD_TYPE} in non-standard and incorrect ways. I suspect the LTO issue is the same.

I'm re-applying the Export file changes that got reverted here as collateral in PR7529. These should have no impact on the swift build, but without them LLDB/upstream-with-swift no longer builds.

I may have time to fix build-script, but the refactoring changes are less important.

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.

4 participants