[CMake] install clang and other resource headers into `CLANG_RESOURCE_DIR/include` if `CLANG_RESOURCE_DIR` is not empty
AbandonedPublic
Actions

Authored by paperchalice on Sep 25 2022, 2:25 AM.

Details

Reviewers

phosek
jdoerfert

Summary

When CLANG_RESOURCE_DIR is not empty, clang will look up builtin headers in CLANG_RESOURCE_DIR/include, this patch makes sure resource headers are installed into the correct location.
Resolve issue #57708.

Diff Detail

Event Timeline

paperchalice created this revision.Sep 25 2022, 2:25 AM

Herald added a project: Restricted Project. · View Herald TranscriptSep 25 2022, 2:25 AM

paperchalice requested review of this revision.Sep 25 2022, 2:25 AM

Herald added a subscriber: cfe-commits. · View Herald TranscriptSep 25 2022, 2:25 AM

Harbormaster completed remote builds in B188561: Diff 462705.Sep 25 2022, 2:59 AM

phosek added inline comments.Sep 26 2022, 11:47 PM

clang/lib/Headers/CMakeLists.txt
266	The property we maintain is that the build directory layout matches the installation directory which makes it possible to use the toolchain without having to install it first. I believe we need to set the `output_dir` depending on the value of `CLANG_RESOURCE_DIR` as well to preserve that behavior.
423–426	nit: can we use `if ... else`?

Update the output_dir.

Harbormaster completed remote builds in B188864: Diff 463114.Sep 27 2022, 12:50 AM

LGTM

This revision is now accepted and ready to land.Sep 27 2022, 2:12 AM

If it is ready to land, could you commit this change? I don't have commit right, thanks.

Let other projects consider CLANG_RESOURCE_DIR too.

Herald added projects: Restricted Project, Restricted Project, Restricted Project. · View Herald TranscriptOct 7 2022, 9:28 PM

Herald added subscribers: llvm-commits, openmp-commits, Restricted Project, Enna1. · View Herald Transcript

Harbormaster completed remote builds in B191069: Diff 466249.Oct 7 2022, 10:37 PM

Herald added a reviewer: jdoerfert. · View Herald TranscriptOct 7 2022, 10:37 PM

Herald added a subscriber: sstefan1. · View Herald Transcript

paperchalice retitled this revision from [CMake] install clang resource headers into `CLANG_RESOURCE_DIR/include` if `CLANG_RESOURCE_DIR` is not empty to [CMake] install clang and other resource headers into `CLANG_RESOURCE_DIR/include` if `CLANG_RESOURCE_DIR` is not empty.Oct 18 2022, 2:31 AM

Ping @phosek, but may need suggestions from other reviewers...
Thanks in advance if someone can commit this change.

openmp/CMakeLists.txt
80 ↗	(On Diff #466249)	Should support `CLANG_RESOURCE_DIR` in standalone mode?

paperchalice abandoned this revision.Oct 26 2022, 6:35 PM

Revision Contents
Changeset List

Path

Size

clang/

lib/

Headers/

CMakeLists.txt

3 lines

Diff 462705

View Options

clang/lib/Headers/CMakeLists.txt

[CMake] install clang and other resource headers into `CLANG_RESOURCE_DIR/include` if `CLANG_RESOURCE_DIR` is not emptyAbandonedPublicActions