Backport clang resource-header fixes from next #5168
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci please test |
compnerd
reviewed
Aug 20, 2022
There was a problem hiding this comment.
I think that I am tempted to say that this is better done as cherry-picking the revert and re-application instead. I don't see anything egregiously incorrect in the application as done, but the serial cherry-picks makes it easier to associate the change with the upstream changes.
git cherry-pick -x 38822b98fa3b9d740b9a68b0de34296205d20819 a70cf56d20b956fc008d24420e14226127ba9f4a
would also make it easier to associate this this with the reported issue upstream at llvm#55002.
… Installation Targets" Caused build failure see github issue llvm#55002 This reverts commit 2512a87. (cherry picked from commit 38822b9)
… Installation Targets The goal of this patch is to improve distribution build's flexibility to include only applicable header files. Currently, the clang-resource-headers target contains nearly all the files in clang/lib/Headers. Most of these files are platform specific (e.g. immintrin.h is x86 specific). A distribution build will have to either include all the headers for all the platforms, or not include any headers. For example, if a distribution build for powerpc includes the clang-resource-headers target, it will include all the x86 specific headers, even-though the x86 specific headers cannot be used. This patch breaks up the clang-resource-headers list to a core list and platform specific lists. With the patch, a distribution build can now include the ppc-resource-headers to include the headers applicable to the powerpc platform. Specifically, one can now have cmake ... LLVM_DISTRIBUTION_COMPONENTS="clang;ppc-resource-headers" ... ../llvm ninja install-distribution then installs the powerpc headers. Similarly, one can do cmake ... LLVM_DISTRIBUTION_COMPONENTS="clang;x86-resource-headers" ... ../llvm to include headers applicable to the x86 platform in a distribution installation. To implement this behaviour, the patch does two things It breaks up the long files header file list to a core list and platform specific lists. It adds numerous platform specific installation targets. Differential Revision: https://reviews.llvm.org/D123498 (cherry picked from commit a70cf56)
etcwilde
force-pushed
the
ewilde/fix-xcode-generator
branch
from
d8da614
to
1747c17
Compare
|
@swift-ci please test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-picking changes from next that remove the files that get installed by multiple targets.
This fixes the failing Xcode generator configuration failure for Swift.