Skip to content

[cmake] Do not use LLVM's configure_lit_site_cfg to configure out lit… #3134

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

Conversation

gottesmm
Copy link
Contributor

What's in this pull request?

Resolved bug number: (SR-)


Before merging this pull request to apple/swift repository:

  • Test pull request on Swift continuous integration.

Triggering Swift CI

The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:

Smoke Testing

Platform Comment
All supported platforms @swift-ci Please smoke test
All supported platforms @swift-ci Please smoke test and merge
OS X platform @swift-ci Please smoke test OS X platform
Linux platform @swift-ci Please smoke test Linux platform

Validation Testing

Platform Comment
All supported platforms @swift-ci Please test
All supported platforms @swift-ci Please test and merge
OS X platform @swift-ci Please test OS X platform
OS X platform @swift-ci Please benchmark
Linux platform @swift-ci Please test Linux platform

Lint Testing

Language Comment
Python @swift-ci Please Python lint

Note: Only members of the Apple organization can trigger swift-ci.

… config.

We do not use any variables in our lit.site.cfg.in files that are not already
set at this point in the configuration. So all calling this function does is
create some variables that are not used and then calls configure.

This commit just removes the call to the function and calls configure directly.
This simplifies the code (we are not calling into llvm) and reduces exposure to
llvm internals changing.

rdar://26154980

… config.

We do not use any variables in our lit.site.cfg.in files that are not already
set at this point in the configuration. So all calling this function does is
create some variables that are not used and then calls configure.

This commit just removes the call to the function and calls configure directly.
This simplifies the code (we are not calling into llvm) and reduces exposure to
llvm internals changing.

rdar://26154980
@gottesmm
Copy link
Contributor Author

@swift-ci Please test

@gottesmm gottesmm changed the title [cmake] Do not use LLVM's configure_lit_site_cfg to configure out lit… [WIP][cmake] Do not use LLVM's configure_lit_site_cfg to configure out lit… Jun 22, 2016
@gottesmm gottesmm changed the title [WIP][cmake] Do not use LLVM's configure_lit_site_cfg to configure out lit… [cmake] Do not use LLVM's configure_lit_site_cfg to configure out lit… Jun 22, 2016
@gottesmm gottesmm merged commit 54da5ff into swiftlang:master Jun 22, 2016
@gottesmm gottesmm deleted the do_not_use_llvms_configure_lit_site_cfg branch June 22, 2016 17:00
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