Skip to content

Remove check for including Runtime due to CmakeConfig.h dependencies #21402

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
Dec 18, 2018
Merged

Conversation

lanza
Copy link
Contributor

@lanza lanza commented Dec 18, 2018

Various files include Runtime/Config.h which depends on
Runtime/CMakeConfig.h and thus this check does not work.

Various files include Runtime/Config.h which depends on
Runtime/CMakeConfig.h and thus this check does not work.
@lanza
Copy link
Contributor Author

lanza commented Dec 18, 2018

@compnerd did you do this yet? Just hit this on Darwin

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

LGTM; this is for the include files only, and the subdirectory only generates the configuration, this won't build the runtime

@compnerd
Copy link
Member

CC: @gparker42

@compnerd
Copy link
Member

@swift-ci please test and merge

@swift-ci swift-ci merged commit 5debcdd into swiftlang:master Dec 18, 2018
@gparker42
Copy link
Contributor

@lanza What were you building that saw this fail?

@lanza
Copy link
Contributor Author

lanza commented Dec 19, 2018

@gparker42 Working with @compnerd and building stdlib-less. The demangler imports swift/runtime/Config.h which imports swift/runtime/CMakeConfig.h.

@lanza lanza deleted the runtime branch December 19, 2018 23:38
@compnerd
Copy link
Member

@gparker42 - btw, you can now reproduce my setup pretty easily: https://github.com/compnerd/toolchain-infrastructure ... basically, I build just the compiler, then use that compiler to build the standard library in a separate build.

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