Skip to content

[build] Merge Clang's features.json from binary directory, handle values #59280

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 21, 2022

Conversation

jansvoboda11
Copy link
Contributor

This patch picks up the features.json file from Clang's build directory instead of the source directory and takes into account the new "value" key. This is necessary due to swiftlang/llvm-project#4803.

rdar://91377604

@jansvoboda11 jansvoboda11 requested review from bnbarham and hyp June 6, 2022 12:55
@jansvoboda11 jansvoboda11 changed the base branch from next to main June 6, 2022 13:02
@jansvoboda11 jansvoboda11 force-pushed the jan_svoboda/features_json branch from 5f1321c to f9c5c45 Compare June 6, 2022 13:03
@jakepetroules
Copy link
Contributor

@swift-ci please smoke test

@bnbarham
Copy link
Contributor

bnbarham commented Jun 6, 2022

macOS failure looks unrelated. Going to test with the LLVM PR to make sure that passes too.

@bnbarham
Copy link
Contributor

bnbarham commented Jun 6, 2022

swiftlang/llvm-project#4803

@swift-ci please smoke test

@bnbarham
Copy link
Contributor

bnbarham commented Jun 6, 2022

Whoops, that PR is on next. @jansvoboda11 could you open a cherry-pick PR for stable/20211026 so we can test it?

@jansvoboda11
Copy link
Contributor Author

swiftlang/llvm-project#4803

@swift-ci please smoke test

@bnbarham
Copy link
Contributor

bnbarham commented Jun 7, 2022

Heh, I guess changing base branch also works 👍

@jansvoboda11
Copy link
Contributor Author

swiftlang/llvm-project#4803

@swift-ci please smoke test

1 similar comment
@jansvoboda11
Copy link
Contributor Author

swiftlang/llvm-project#4803

@swift-ci please smoke test

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.

3 participants