Skip to content

build: match hardcoded extensions in the compiler #217

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
Jun 22, 2018

Conversation

compnerd
Copy link
Member

The swiftdoc partials must have the extension .swiftdoc. Adjust the
output names to match this assumption. This is needed to repair the
CMake build with the newer compiler.

The swiftdoc partials must have the extension .swiftdoc.  Adjust the
output names to match this assumption.  This is needed to repair the
CMake build with the newer compiler.
@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

CC: @modocache @aciidb0mb3r

Copy link
Contributor

@modocache modocache left a comment

Choose a reason for hiding this comment

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

Could you link to the commit in apple/swift that changed the extension name, either here or in the commit message? Otherwise LGTM!

@compnerd
Copy link
Member Author

I can point out where the assumption lies, I think that I had an older swiftc that I was building with and that recent unrelated changes now exposed the bug that had existed in the documentation building.

@compnerd
Copy link
Member Author

https://github.com/apple/swift/blob/master/lib/Frontend/Frontend.cpp#L164:

setup -> setUpInputs -> setUpForInput -> getRecordedBufferID -> getInputBufferAndModuleDocBufferIfPresent -> openModuleDoc

The last frame will look for a .swiftdoc at https://github.com/apple/swift/blob/master/lib/Frontend/Frontend.cpp#L347

@compnerd compnerd merged commit 11b22e5 into swiftlang:master Jun 22, 2018
@compnerd compnerd deleted the extension branch June 22, 2018 22:57
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