[CMake] Cache the compiler-rt library search results

[phosek]

Summary

There's a lot of duplicated calls to find various compiler-rt libraries
from build of runtime libraries like libunwind, libc++, libc++abi and
compiler-rt. The compiler-rt helper module already implemented caching
for results avoid repeated Clang invocations.

This change moves the compiler-rt implementation into a shared location
and reuses it from other runtimes to reduce duplication and speed up
the build.

[compnerd]

If we require LLVM for any of the projects, perhaps we should hoist the HandleCompilerRT.cmake into LLVM and avoid having to maintain the copy everywhere.

cmake/Modules/HandleCompilerRT.cmake

6

Why change this to a macro? Its setting a cached variable, which should be possible from within a function right?

libcxx/cmake/Modules/HandleCompilerRT.cmake

0

Please make this a function as well.

0

Where is target supposed to be defined? This is tautologically if(CMAKE_CXX_COMPILER_TARGET) no?

14

I think that this deserves a comment explaining what is going on. Using clang's runtime with gcc is possible.

libcxxabi/cmake/Modules/HandleCompilerRT.cmake

0

Please make this a function

libunwind/cmake/Modules/HandleCompilerRT.cmake

0

Same

[phosek]

cmake/Modules/HandleCompilerRT.cmake

6

This is an implementation detail which shouldn't be used from outside of this file, I was originally planning on moving it inside find_compiler_rt_library but then I realized we may also want to use it from find_compiler_rt_dir. Maybe we should rename this function to __cache_compiler_rt_library to signal the fact that it's internal?

[phosek]

In D88458#2302059, @compnerd wrote:

If we require LLVM for any of the projects, perhaps we should hoist the HandleCompilerRT.cmake into LLVM and avoid having to maintain the copy everywhere.

That's the eventual plan but we haven't yet figured out how the sharing is going to work.

[compnerd]

libunwind/cmake/Modules/HandleCompilerRT.cmake

0

I'm still not connecting where target is set.

[ldionne]

All those projects should require the whole LLVM monorepo. Let's have a single copy of HandleCompilerRT.

[ldionne]

In D88458#2302188, @phosek wrote:

In D88458#2302059, @compnerd wrote:

If we require LLVM for any of the projects, perhaps we should hoist the HandleCompilerRT.cmake into LLVM and avoid having to maintain the copy everywhere.

That's the eventual plan but we haven't yet figured out how the sharing is going to work.

What do you mean? Just include(...) the file from the various projects?

[phosek]

In D88458#2304125, @ldionne wrote:

In D88458#2302188, @phosek wrote:

In D88458#2302059, @compnerd wrote:

If we require LLVM for any of the projects, perhaps we should hoist the HandleCompilerRT.cmake into LLVM and avoid having to maintain the copy everywhere.

That's the eventual plan but we haven't yet figured out how the sharing is going to work.

What do you mean? Just include(...) the file from the various projects?

When migrating to monorepo, we discussed a plan to provide slices for individual projects. While these haven't been provided officially, we already have these for our own purposes (e.g. https://llvm.googlesource.com/llvm-project/libcxx/) and they are used by projects like Chromium. A potential solution would be extend the machinery so that the content of <llvm-project>/cmake/Modules is copied into each slice?

[ldionne]

In D88458#2304175, @phosek wrote:

In D88458#2304125, @ldionne wrote:

In D88458#2302188, @phosek wrote:

In D88458#2302059, @compnerd wrote:

If we require LLVM for any of the projects, perhaps we should hoist the HandleCompilerRT.cmake into LLVM and avoid having to maintain the copy everywhere.

That's the eventual plan but we haven't yet figured out how the sharing is going to work.

What do you mean? Just include(...) the file from the various projects?

When migrating to monorepo, we discussed a plan to provide slices for individual projects. While these haven't been provided officially, we already have these for our own purposes (e.g. https://llvm.googlesource.com/llvm-project/libcxx/) and they are used by projects like Chromium. A potential solution would be extend the machinery so that the content of <llvm-project>/cmake/Modules is copied into each slice?

I wasn't aware of that, and libc++ / libc++abi don't support that. See http://lists.llvm.org/pipermail/libcxx-dev/2020-March/000714.html for example.

In libc++ and libc++abi, we make the assumption that we're checked out at the root of the monorepo. Please sell me the need to support something else, because the only benefit I can think of is "it's faster to clone just libc++", which is not a strong argument to justify such code duplication.

[phosek]

@ldionne I'm picking up this change again as I'm planning to do a larger cleanup of CMake checks in the coming weeks. I have extracted the compiler-rt logic into a shared module and reused it from other runtimes, let me know if this looks good to you.

[phosek]

@beanz @smeenai Can you take a look as well?

[ldionne]

This LGTM, but it's going to break some people who copy only some subdirectories of llvm. I think it's unavoidable, but we'll want to let them know. I think it might apply to e.g. @thakis.

I assume we'll also want to move more common stuff to <root>/cmake in the future? A common place for CMake modules has been sorely needed for a while, thanks for getting the ball rolling!

compiler-rt/cmake/config-ix.cmake

19

Wasn't aware of this, it's pretty awesome.

[phosek]

In D88458#3010547, @ldionne wrote:

This LGTM, but it's going to break some people who copy only some subdirectories of llvm. I think it's unavoidable, but we'll want to let them know. I think it might apply to e.g. @thakis.

Chromium is building libc++, libc++abi and libunwind outside of the monorepo, but they use their own GN build so this shouldn't affect them.

I assume we'll also want to move more common stuff to <root>/cmake in the future? A common place for CMake modules has been sorely needed for a while, thanks for getting the ball rolling!

Yes, that's the plan. In particular, after D110005 lands, I'd like to move most of the helper macros and functions from libcxx/cmake/Modules/HandleLibcxxFlags.cmake that are shared across runtimes to <root>/cmake so we don't need to keep them in sync manually.

[steven_wu]

LGTM.

I want to do something like this for a long time. It would be good to ReleaseNote the change so people who is distributing/building with a subset of the project directories can be updated to build with top level cmake directory (@ldionne that probably include our internal build system). Some day we might be able to cmake configure with the top level llvm-project directory.

[mstorsjo]

In D88458#3010547, @ldionne wrote:

This LGTM, but it's going to break some people who copy only some subdirectories of llvm. I think it's unavoidable, but we'll want to let them know. I think it might apply to e.g. @thakis.

AFAIK @tstellar builds the runtimes this way too.

[tstellar]

If all the cmake files where installed to <root>/cmake. Distros like Fedora that build LLVM in standalone mode would likely package all these files into a llvm-cmake package and have the other projects depend on it. I actually think doing this will make standalone builds easier. If we do move to this approach, can we make sure the other projects that depend on them don't hardcode source paths, but have the option to include them from any directory on the system. I don' t think supporting this will be too invasive.

[smeenai]

This looks great, and having a top-level CMake modules directory makes a lot of sense.

[dexonsmith]

There's no LICENSE.TXT file at the top level so there isn't one that clearly applies to the new cmake/. Should compiler-rt/LICENSE.TXT be copied to cmake/LICENSE.TXT?

[beanz]

In D88458#3013813, @dexonsmith wrote:

There's no LICENSE.TXT file at the top level so there isn't one that clearly applies to the new cmake/. Should compiler-rt/LICENSE.TXT be copied to cmake/LICENSE.TXT?

Is there any reason not to just put one at the top now?

I assume we aren't going to add a new per-project mirror for the cmake folder, so we might as well just have a license file at the root and not inside the cmake directory. Since all the licenses are the same my understanding was the only reason we kept them per-directory was to ensure they appeared in the mirrors.

[dexonsmith]

In D88458#3013817, @beanz wrote:

In D88458#3013813, @dexonsmith wrote:

There's no LICENSE.TXT file at the top level so there isn't one that clearly applies to the new cmake/. Should compiler-rt/LICENSE.TXT be copied to cmake/LICENSE.TXT?

Is there any reason not to just put one at the top now?

This was suggested before and there wasn't consensus for change. See https://reviews.llvm.org/D64875.

[phosek]

In D88458#3019076, @dexonsmith wrote:

In D88458#3013817, @beanz wrote:

In D88458#3013813, @dexonsmith wrote:

There's no LICENSE.TXT file at the top level so there isn't one that clearly applies to the new cmake/. Should compiler-rt/LICENSE.TXT be copied to cmake/LICENSE.TXT?

Is there any reason not to just put one at the top now?

This was suggested before and there wasn't consensus for change. See https://reviews.llvm.org/D64875.

I don't mind adding a license file, but we also seem to be missing one for other top-level directories that were added recently like cross-project-tests, runtimes or utils so I wonder if this is something that needs to be addressed more broadly?

[beanz]

In D88458#3029632, @phosek wrote:

I don't mind adding a license file, but we also seem to be missing one for other top-level directories that were added recently like cross-project-tests, runtimes or utils so I wonder if this is something that needs to be addressed more broadly?

Totally agree with @phosek here. A lot has changed since 2019. One big point is that we are making it so you can’t build some parts of the project without a checkout of the mono repo.

[phosek]

Is there any objection to landing this change as is and addressing the licensing aspect later in a separate change?

[ldionne]

In D88458#3032086, @phosek wrote:

Is there any objection to landing this change as is and addressing the licensing aspect later in a separate change?

IMO that's reasonable, let's not hold this change back -- the lack of a top-level license in some subdirectories is a pre-existing condition, so when we decide what to do about that issue, we can solve it for all subdirectories.

I'd like to see CI passing before we ship this though.

[phosek]

In D88458#3040347, @ldionne wrote:

In D88458#3032086, @phosek wrote:

Is there any objection to landing this change as is and addressing the licensing aspect later in a separate change?

IMO that's reasonable, let's not hold this change back -- the lack of a top-level license in some subdirectories is a pre-existing condition, so when we decide what to do about that issue, we can solve it for all subdirectories.

I'd like to see CI passing before we ship this though.

Done, I believe I've also addressed PR51389 which was the reason for the failing build on Darwin.

[serge-sans-paille]

I suspect this is going to impact llvm/utils/release/export.sh that creates individual tarballs based on git directory content. If we were using cpack there, this wouldn't be an issue though. @tstellar can you confirm?

[phosek]

In D88458#3050432, @serge-sans-paille wrote:

I suspect this is going to impact llvm/utils/release/export.sh that creates individual tarballs based on git directory content. If we were using cpack there, this wouldn't be an issue though. @tstellar can you confirm?

Is the expectation that these tarballs are separately buildable? Is there any kind of checking done to ensure that it's indeed the case? We could update the script to also create a tarball for the top-level CMake directory.

[h-vetinari]

Given the cross-review of the respective authors, I'm assuming this is compatible / aligned with https://reviews.llvm.org/D111356? I ask because despite the mutual review, this wasn't mentioned in the email to LLVM-dev about the latter.

[phosek]

In D88458#3056914, @h-vetinari wrote:

Given the cross-review of the respective authors, I'm assuming this is compatible / aligned with https://reviews.llvm.org/D111356? I ask because despite the mutual review, this wasn't mentioned in the email to LLVM-dev about the latter.

I sent a separate RFC about this change to llvm-dev last week. These two changes are orthogonal although they both fit our shared goal of cleaning up and simplifying the build.

[ldionne]

Are we waiting for something to land this? If not, let's do this!

[phosek]

In D88458#3064400, @ldionne wrote:

Are we waiting for something to land this? If not, let's do this!

I was looking at the script for building distribution archives and zorg, but those can be updated separately (we'll need to do it for the runtimes/ directory as well).

[Abpostelnicu]

I think this creates a build bustage when llvm is built with the following flags:

cmake -GNinja -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_ASM_COMPILER=/usr/bin/gcc -DCMAKE_LINKER=/usr/bin/ld -DCMAKE_AR=/usr/bin/ar -DCMAKE_C_FLAGS= -DCMAKE_CXX_FLAGS= -DCMAKE_ASM_FLAGS= -DCMAKE_EXE_LINKER_FLAGS=-Wl,-Bsymbolic-functions -fuse-ld=gold -Wl,--gc-sections -Wl,--icf=safe -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-Bsymbolic-functions -fuse-ld=gold -Wl,--gc-sections -Wl,--icf=safe -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/builds/worker/fetches/llvm-project/build/stage1/clang -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_ENABLE_ASSERTIONS=OFF -DLLVM_TOOL_LIBCXX_BUILD=ON -DLLVM_ENABLE_BINDINGS=OFF -DCLANG_REPOSITORY_STRING=taskcluster-UynxIUZSRCaRcXEcj3dHqA -DLLVM_ENABLE_PROJECTS=clang;compiler-rt -DLLVM_INCLUDE_TESTS=OFF -DLLVM_TOOL_LLI_BUILD=OFF -DCOMPILER_RT_BUILD_SANITIZERS=OFF -DCOMPILER_RT_BUILD_XRAY=OFF -DCOMPILER_RT_BUILD_MEMPROF=OFF -DCOMPILER_RT_BUILD_LIBFUZZER=OFF -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_RANLIB=/usr/bin/ranlib /builds/worker/fetches/llvm-project/llvm

The issues that occur are like:

Determining if the include file histedit.h exists failed with the following output:

Change Dir: /builds/worker/fetches/llvm-project/build/stage1/build/CMakeFiles/CMakeTmp



Run Build Command(s):/usr/bin/ninja cmTC_14991 && [1/2] Building C object CMakeFiles/cmTC_14991.dir/CheckIncludeFile.c.o

FAILED: CMakeFiles/cmTC_14991.dir/CheckIncludeFile.c.o 

/usr/bin/gcc    -o CMakeFiles/cmTC_14991.dir/CheckIncludeFile.c.o -c CheckIncludeFile.c

CheckIncludeFile.c:1:10: fatal error: histedit.h: No such file or directory

    1 | #include <histedit.h>

      |          ^~~~~~~~~~~~

compilation terminated.

ninja: build stopped: subcommand failed.

[manojgupta]

This is also causing build failures in our ToT builds.

phosek@ can you please revert.
You might be able to see the logs here:
https://logs.chromium.org/logs/chromeos/buildbucket/cr-buildbucket/8832772415946723489/+/steps/update_sdk/0/steps/call_chromite.api.SdkService_Update/0/steps/call_build_API_script/0/stdout

The package is building libc++abi for 32-bit and 64-bit x86.

See that for 32-bit, compiler rt detection is going wrong.
libcxxabi-13.0_pre428724-r4: -- Found compiler-rt builtins library: /usr/lib64/clang/14.0.0/lib/linux/libclang_rt.builtins-x86_64.a .

Nowhere, is 32-bit detected correctly.

[phosek]

Thanks for update, I have reverted the change and I'll try to reproduce and debug the issue.

[phosek]

@manojgupta Where can I find the cache and toolchain files used in your build? I'm not able to reproduce the issue.

[manojgupta]

I'll send the cache and other details by email.

[phosek]

Properly handle the flags to address the issue seen on some bots when cross-compiling.

[Abpostelnicu]

In D88458#3089403, @phosek wrote:

Properly handle the flags to address the issue seen on some bots when cross-compiling.

I don't know if you noticed my previous comment but this again broke the build.

[phosek]

In D88458#3093023, @Abpostelnicu wrote:

In D88458#3089403, @phosek wrote:

Properly handle the flags to address the issue seen on some bots when cross-compiling.

I don't know if you noticed my previous comment but this again broke the build.

I tried reproducing the issue locally using the command you provided but I'm not seeing the same error. Would it be possible to share CMakeFiles/CMakeError.log from your build?

[Abpostelnicu]

In D88458#3095459, @phosek wrote:

In D88458#3093023, @Abpostelnicu wrote:

In D88458#3089403, @phosek wrote:

Properly handle the flags to address the issue seen on some bots when cross-compiling.

I don't know if you noticed my previous comment but this again broke the build.

I tried reproducing the issue locally using the command you provided but I'm not seeing the same error. Would it be possible to share CMakeFiles/CMakeError.log from your build?

Thanks for looking into this. Please see this.

[phosek]

In D88458#3100139, @Abpostelnicu wrote:

In D88458#3095459, @phosek wrote:

In D88458#3093023, @Abpostelnicu wrote:

In D88458#3089403, @phosek wrote:

Properly handle the flags to address the issue seen on some bots when cross-compiling.

I don't know if you noticed my previous comment but this again broke the build.

I tried reproducing the issue locally using the command you provided but I'm not seeing the same error. Would it be possible to share CMakeFiles/CMakeError.log from your build?

Thanks for looking into this. Please see this.

Thanks, I looked at the CMakeError.log file but there's nothing out of ordinary. I don't think that the failing histedit.h check is a new issue, that seems like the expected behavior.

Can I see the full build log somewhere?

[Abpostelnicu]

In D88458#3100557, @phosek wrote:

In D88458#3100139, @Abpostelnicu wrote:

In D88458#3095459, @phosek wrote:

In D88458#3093023, @Abpostelnicu wrote:

In D88458#3089403, @phosek wrote:

Properly handle the flags to address the issue seen on some bots when cross-compiling.

I don't know if you noticed my previous comment but this again broke the build. It's a tar of the build directory.

I tried reproducing the issue locally using the command you provided but I'm not seeing the same error. Would it be possible to share CMakeFiles/CMakeError.log from your build?

Thanks for looking into this. Please see this.

Thanks, I looked at the CMakeError.log file but there's nothing out of ordinary. I don't think that the failing histedit.h check is a new issue, that seems like the expected behavior.

Can I see the full build log somewhere?

Please let me know if this helps https://drive.google.com/file/d/1nzKVJOnYWuXKH1nJufClXCq5QHeJBlVp/view?usp=sharing

[phosek]

In D88458#3108920, @Abpostelnicu wrote:

In D88458#3100557, @phosek wrote:

In D88458#3100139, @Abpostelnicu wrote:

In D88458#3095459, @phosek wrote:

In D88458#3093023, @Abpostelnicu wrote:

In D88458#3089403, @phosek wrote:

Properly handle the flags to address the issue seen on some bots when cross-compiling.

I don't know if you noticed my previous comment but this again broke the build. It's a tar of the build directory.

I tried reproducing the issue locally using the command you provided but I'm not seeing the same error. Would it be possible to share CMakeFiles/CMakeError.log from your build?

Thanks for looking into this. Please see this.

Thanks, I looked at the CMakeError.log file but there's nothing out of ordinary. I don't think that the failing histedit.h check is a new issue, that seems like the expected behavior.

Can I see the full build log somewhere?

Please let me know if this helps https://drive.google.com/file/d/1nzKVJOnYWuXKH1nJufClXCq5QHeJBlVp/view?usp=sharing

I was hoping to see the output from CMake which is not included.

[Abpostelnicu]

In D88458#3109346, @phosek wrote:

In D88458#3108920, @Abpostelnicu wrote:

In D88458#3100557, @phosek wrote:

In D88458#3100139, @Abpostelnicu wrote:

In D88458#3095459, @phosek wrote:

In D88458#3093023, @Abpostelnicu wrote:

In D88458#3089403, @phosek wrote:

Properly handle the flags to address the issue seen on some bots when cross-compiling.

I don't know if you noticed my previous comment but this again broke the build. It's a tar of the build directory.

I tried reproducing the issue locally using the command you provided but I'm not seeing the same error. Would it be possible to share CMakeFiles/CMakeError.log from your build?

Thanks for looking into this. Please see this.

Thanks, I looked at the CMakeError.log file but there's nothing out of ordinary. I don't think that the failing histedit.h check is a new issue, that seems like the expected behavior.

Can I see the full build log somewhere?

Please let me know if this helps https://drive.google.com/file/d/1nzKVJOnYWuXKH1nJufClXCq5QHeJBlVp/view?usp=sharing

I was hoping to see the output from CMake which is not included.

Sure, is this something that helps https://paste.mozilla.org/yxUYUBk3 ?

[phosek]

In D88458#3117759, @Abpostelnicu wrote:

Sure, is this something that helps https://paste.mozilla.org/yxUYUBk3 ?

Yes, thank you. The issue is this:

CMake Error at projects/compiler-rt/cmake/Modules/AddCompilerRT.cmake:3 (include):
include could not find load file:

/builds/worker/fetches/llvm-project/llvm/projects/compiler-rt/../cmake/Modules/HandleCompilerRT.cmake
Call Stack (most recent call first):
projects/compiler-rt/lib/CMakeLists.txt:4 (include)

It looks to me like you're using the pre-monorepo layout where you move compiler-rt to llvm/projects, is that correct?

We could make it work, but I'm not sure if we should. The monorepo layout is the only supported one and we've already discussed the plans to remove the non-monorepo layout support to simplify our build.

[Abpostelnicu]

In D88458#3117814, @phosek wrote:

In D88458#3117759, @Abpostelnicu wrote:

Sure, is this something that helps https://paste.mozilla.org/yxUYUBk3 ?

Yes, thank you. The issue is this:

CMake Error at projects/compiler-rt/cmake/Modules/AddCompilerRT.cmake:3 (include):
include could not find load file:

/builds/worker/fetches/llvm-project/llvm/projects/compiler-rt/../cmake/Modules/HandleCompilerRT.cmake
Call Stack (most recent call first):
projects/compiler-rt/lib/CMakeLists.txt:4 (include)

It looks to me like you're using the pre-monorepo layout where you move compiler-rt to llvm/projects, is that correct?

Yes, you are correct.

We could make it work, but I'm not sure if we should. The monorepo layout is the only supported one and we've already discussed the plans to remove the non-monorepo layout support to simplify our build.

It would be better to make it work, removing support for the old build system will break many toolchains.

[phosek]

In D88458#3117828, @Abpostelnicu wrote:

In D88458#3117814, @phosek wrote:

It looks to me like you're using the pre-monorepo layout where you move compiler-rt to llvm/projects, is that correct?

Yes, you are correct.

Is there any particular reason for doing this rather than simply using the monorepo layout?

We could make it work, but I'm not sure if we should. The monorepo layout is the only supported one and we've already discussed the plans to remove the non-monorepo layout support to simplify our build.

It would be better to make it work, removing support for the old build system will break many toolchains.

So far you're the only one who reached affected by this change which to me suggests that there may not be many projects using the old layout.

When LLVM adopted the monorepo we made no guarantees that we would keep the old layout working.

We're also planning larger build changes after LLVM 14 which will likely disrupt you, see https://lists.llvm.org/pipermail/llvm-dev/2021-October/153238.html.

[Abpostelnicu]

In D88458#3117882, @phosek wrote:

In D88458#3117828, @Abpostelnicu wrote:

In D88458#3117814, @phosek wrote:

It looks to me like you're using the pre-monorepo layout where you move compiler-rt to llvm/projects, is that correct?

Yes, you are correct.

Is there any particular reason for doing this rather than simply using the monorepo layout?

We could make it work, but I'm not sure if we should. The monorepo layout is the only supported one and we've already discussed the plans to remove the non-monorepo layout support to simplify our build.

It would be better to make it work, removing support for the old build system will break many toolchains.

So far you're the only one who reached affected by this change which to me suggests that there may not be many projects using the old layout.

When LLVM adopted the monorepo we made no guarantees that we would keep the old layout working.

True but this is the first change that breaks it.

We're also planning larger build changes after LLVM 14 which will likely disrupt you, see https://lists.llvm.org/pipermail/llvm-dev/2021-October/153238.html.

I think we are getting a bit far, there is time till then to do our adjustments.

[ldionne]

In D88458#3130720, @Abpostelnicu wrote:

In D88458#3117882, @phosek wrote:

So far you're the only one who reached affected by this change which to me suggests that there may not be many projects using the old layout.

When LLVM adopted the monorepo we made no guarantees that we would keep the old layout working.

True but this is the first change that breaks it.

We're also planning larger build changes after LLVM 14 which will likely disrupt you, see https://lists.llvm.org/pipermail/llvm-dev/2021-October/153238.html.

I think we are getting a bit far, there is time till then to do our adjustments.

FWIW I 100% support @phosek here. We are making improvements to our build system that allow us to reduce maintenance costs, increase flexibility of our build system (e.g. for new platforms), reduce the room for mistakes, etc. As often the case with this kind of change, it requires the cooperation from downstream people who use our code.

We have done everything we can to communicate these changes to downstream users and we are giving them a generous grace period, now it is their (your) responsibility to act on that notification. Concretely, please:

1. Make sure you are building in a vanilla monorepo layout.
2. Make sure you use one of the documented ways to build the runtimes: https://libcxx.llvm.org/BuildingLibcxx.html

If you don't do that, LLVM 15 is going to break you, and we will not revert that.

cmake/Modules/HandleCompilerRT.cmake

 # Check if compile-rt library file path exists.
 # If found, cache the path in:
 #    COMPILER_RT_LIBRARY-<name>-<target>
 # If err_flag is true OR path not found, emit a message and set:
 #    COMPILER_RT_LIBRARY-<name>-<target> to NOTFOUND
 function(cache_compiler_rt_library err_flag name target library_file)
   if(err_flag OR NOT EXISTS "${library_file}")
     message(STATUS "Failed to find compiler-rt ${name} library for ${target}")
-    set(COMPILER_RT_LIBRARY-${name}-${target} "NOTFOUND" CACHE INTERNAL
+    set(COMPILER_RT_LIBRARY_${name}_${target} "NOTFOUND" CACHE INTERNAL
         "compiler-rt ${name} library for ${target}")
   else()
     message(STATUS "Found compiler-rt ${name} library: ${library_file}")
-    set(COMPILER_RT_LIBRARY-${name}-${target} "${library_file}" CACHE INTERNAL
+    set(COMPILER_RT_LIBRARY_${name}_${target} "${library_file}" CACHE INTERNAL
         "compiler-rt ${name} library for ${target}")
   endif()
 endfunction()
 
-# Find the path to compiler-rt library `name` (e.g. "builtins") for
-# the specified `target` (e.g. "x86_64-linux") and return it in `variable`.
+# Find the path to compiler-rt library `name` (e.g. "builtins") for the
+# specified `TARGET` (e.g. "x86_64-linux-gnu") and return it in `variable`.
 # This calls cache_compiler_rt_library that caches the path to speed up
 # repeated invocations with the same `name` and `target`.
-function(find_compiler_rt_library name target variable)
+function(find_compiler_rt_library name variable)
+  cmake_parse_arguments(ARG "" "TARGET" "" ${ARGN})
+  # While we can use compiler-rt runtimes with other compilers, we need to
+  # query the compiler for runtime location and thus we require Clang.
   if(NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
     set(${variable} "NOTFOUND" PARENT_SCOPE)
     return()
   endif()
-  if (NOT target AND CMAKE_CXX_COMPILER_TARGET)
+  set(target "${ARG_TARGET}")
+  if(NOT target AND CMAKE_CXX_COMPILER_TARGET)
     set(target "${CMAKE_CXX_COMPILER_TARGET}")
   endif()
-  if(NOT DEFINED COMPILER_RT_LIBRARY-builtins-${target})
+  if(NOT DEFINED COMPILER_RT_LIBRARY_builtins_${target})
     # If the cache variable is not defined, invoke clang and then 
     # set it with cache_compiler_rt_library.
-    set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${SANITIZER_COMMON_FLAGS}
+    set(clang_command ${CMAKE_CXX_COMPILER} ${CMAKE_REQUIRED_FLAGS}
         "--rtlib=compiler-rt" "-print-libgcc-file-name")
     if(target)
-      list(APPEND CLANG_COMMAND "--target=${target}")
+      list(APPEND clang_command "--target=${target}")
     endif()
-    get_property(SANITIZER_CXX_FLAGS CACHE CMAKE_CXX_FLAGS PROPERTY VALUE)
-    string(REPLACE " " ";" SANITIZER_CXX_FLAGS "${SANITIZER_CXX_FLAGS}")
-    list(APPEND CLANG_COMMAND ${SANITIZER_CXX_FLAGS})
+    get_property(cxx_flags CACHE CMAKE_CXX_FLAGS PROPERTY VALUE)
+    string(REPLACE " " ";" cxx_flags "${cxx_flags}")
+    list(APPEND clang_command ${cxx_flags})
     execute_process(
-      COMMAND ${CLANG_COMMAND}
+      COMMAND ${clang_command}
       RESULT_VARIABLE HAD_ERROR
       OUTPUT_VARIABLE LIBRARY_FILE
     )
     string(STRIP "${LIBRARY_FILE}" LIBRARY_FILE)
     file(TO_CMAKE_PATH "${LIBRARY_FILE}" LIBRARY_FILE)
-    cache_compiler_rt_library(${HAD_ERROR}
-      builtins "${target}" "${LIBRARY_FILE}")
+    cache_compiler_rt_library(${HAD_ERROR} builtins "${target}" "${LIBRARY_FILE}")
   endif()
-  if(NOT COMPILER_RT_LIBRARY-builtins-${target})
+  if(NOT COMPILER_RT_LIBRARY_builtins_${target})
     set(${variable} "NOTFOUND" PARENT_SCOPE)
     return()
   endif()
-  if(NOT DEFINED COMPILER_RT_LIBRARY-${name}-${target})
-    # clang gives only the builtins library path. Other library paths are
+  if(NOT DEFINED COMPILER_RT_LIBRARY_${name}_${target})
+    # Clang gives only the builtins library path. Other library paths are
     # obtained by substituting "builtins" with ${name} in the builtins
     # path and then checking if the resultant path exists. The result of
     # this check is also cached by cache_compiler_rt_library.
-    set(LIBRARY_FILE "${COMPILER_RT_LIBRARY-builtins-${target}}")
+    set(LIBRARY_FILE "${COMPILER_RT_LIBRARY_builtins_${target}}")
     string(REPLACE "builtins" "${name}" LIBRARY_FILE "${LIBRARY_FILE}")
     cache_compiler_rt_library(FALSE "${name}" "${target}" "${LIBRARY_FILE}")
   endif()
-  set(${variable} "${COMPILER_RT_LIBRARY-${name}-${target}}" PARENT_SCOPE)
+  set(${variable} "${COMPILER_RT_LIBRARY_${name}_${target}}" PARENT_SCOPE)
 endfunction()

compiler-rt/CMakeLists.txt

if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD)
   set(COMPILER_RT_STANDALONE_BUILD TRUE)
   set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 endif()
 
 # Add path for custom compiler-rt modules.
 list(INSERT CMAKE_MODULE_PATH 0
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules"
   )
 
 if(CMAKE_CONFIGURATION_TYPES)
   set(CMAKE_CFG_RESOLVED_INTDIR "${CMAKE_CFG_INTDIR}/")
 else()
   set(CMAKE_CFG_RESOLVED_INTDIR "")
 endif()
 

compiler-rt/cmake/Modules/AddCompilerRT.cmake

foreach(arch ${LIB_ARCHS})
           set_output_name(output_name_${libname} ${name}_dynamic ${arch})
         else()
           set_output_name(output_name_${libname} ${name} ${arch})
         endif()
       endif()
       if(COMPILER_RT_USE_BUILTINS_LIBRARY AND NOT type STREQUAL "OBJECT" AND
          NOT name STREQUAL "clang_rt.builtins")
         get_compiler_rt_target(${arch} target)
-        find_compiler_rt_library(builtins ${target} builtins_${libname})
+        find_compiler_rt_library(builtins builtins_${libname} TARGET ${target})
         if(builtins_${libname} STREQUAL "NOTFOUND")
           message(FATAL_ERROR "Cannot find builtins library for the target architecture")
         endif()
       endif()
       set(sources_${libname} ${LIB_SOURCES})
       format_object_libs(sources_${libname} ${arch} ${LIB_OBJECT_LIBS})
       set(libnames ${libnames} ${libname})
       set(extra_cflags_${libname} ${TARGET_${arch}_CFLAGS} ${NO_LTO_FLAGS} ${NO_PGO_FLAGS} ${LIB_CFLAGS})

compiler-rt/cmake/config-ix.cmake

function(compiler_rt_check_linker_flag flag out_var)
   set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${flag}")
   check_cxx_compiler_flag("" ${out_var})
   cmake_pop_check_state()
 endfunction()
 
 check_library_exists(c fopen "" COMPILER_RT_HAS_LIBC)
 if (COMPILER_RT_USE_BUILTINS_LIBRARY)
   include(HandleCompilerRT)
-  find_compiler_rt_library(builtins "" COMPILER_RT_BUILTINS_LIBRARY)
+  cmake_push_check_state()
+  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${SANITIZER_COMMON_FLAGS}")
+  find_compiler_rt_library(builtins COMPILER_RT_BUILTINS_LIBRARY)
+  cmake_pop_check_state()
 else()
   if (ANDROID)
     check_library_exists(gcc __gcc_personality_v0 "" COMPILER_RT_HAS_GCC_LIB)
   else()
     check_library_exists(gcc_s __gcc_personality_v0 "" COMPILER_RT_HAS_GCC_S_LIB)
   endif()
 endif()
 

compiler-rt/lib/builtins/CMakeLists.txt

 # This directory contains a large amount of C code which provides
 # generic implementations of the core runtime library along with optimized
 # architecture-specific code in various subdirectories.
 
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   cmake_minimum_required(VERSION 3.13.4)
 
   set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
   project(CompilerRTBuiltins C ASM)
   set(COMPILER_RT_STANDALONE_BUILD TRUE)
   set(COMPILER_RT_BUILTINS_STANDALONE_BUILD TRUE)
   list(INSERT CMAKE_MODULE_PATH 0
     "${CMAKE_SOURCE_DIR}/../../cmake"
-    "${CMAKE_SOURCE_DIR}/../../cmake/Modules")
+    "${CMAKE_SOURCE_DIR}/../../cmake/Modules"
+    "${CMAKE_SOURCE_DIR}/../../../cmake"
+    "${CMAKE_SOURCE_DIR}/../../../cmake/Modules")
   include(base-config-ix)
   include(CompilerRTUtils)
 
   load_llvm_config()
   construct_compiler_rt_default_triple()
 
   if(APPLE)
     include(CompilerRTDarwinUtils)

libcxx/CMakeLists.txt

 # See https://libcxx.llvm.org/docs/BuildingLibcxx.html for instructions on how
 # to build libcxx with CMake.
 
 if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libcxxabi")
   message(FATAL_ERROR "libc++ now requires being built in a monorepo layout with libcxxabi available")
 endif()
 
 #===============================================================================
 # Setup Project
 #===============================================================================
 cmake_minimum_required(VERSION 3.13.4)
 
 # Add path for custom modules
 set(CMAKE_MODULE_PATH
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules"
   ${CMAKE_MODULE_PATH}
   )
 
 set(CMAKE_FOLDER "libc++")
 
 set(LIBCXX_SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR})
 set(LIBCXX_BINARY_DIR  ${CMAKE_CURRENT_BINARY_DIR})
 set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build")

libcxx/cmake/Modules/HandleCompilerRT.cmake

-function(find_compiler_rt_library name dest)
-  if (NOT DEFINED LIBCXX_COMPILE_FLAGS)
-    message(FATAL_ERROR "LIBCXX_COMPILE_FLAGS must be defined when using this function")
-  endif()
-  set(dest "" PARENT_SCOPE)
-  set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBCXX_COMPILE_FLAGS}
-      "--rtlib=compiler-rt" "--print-libgcc-file-name")
-  if (CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_TARGET)
-    list(APPEND CLANG_COMMAND "--target=${CMAKE_CXX_COMPILER_TARGET}")
-  endif()
-  get_property(LIBCXX_CXX_FLAGS CACHE CMAKE_CXX_FLAGS PROPERTY VALUE)
-  string(REPLACE " " ";" LIBCXX_CXX_FLAGS "${LIBCXX_CXX_FLAGS}")
-  list(APPEND CLANG_COMMAND ${LIBCXX_CXX_FLAGS})
-  execute_process(
-      COMMAND ${CLANG_COMMAND}
-      RESULT_VARIABLE HAD_ERROR
-      OUTPUT_VARIABLE LIBRARY_FILE
-  )
-  string(STRIP "${LIBRARY_FILE}" LIBRARY_FILE)
-  file(TO_CMAKE_PATH "${LIBRARY_FILE}" LIBRARY_FILE)
-  string(REPLACE "builtins" "${name}" LIBRARY_FILE "${LIBRARY_FILE}")
-  if (NOT HAD_ERROR AND EXISTS "${LIBRARY_FILE}")
-    message(STATUS "Found compiler-rt library: ${LIBRARY_FILE}")
-    set(${dest} "${LIBRARY_FILE}" PARENT_SCOPE)
-  else()
-    message(STATUS "Failed to find compiler-rt library")
-  endif()
-endfunction()
-
-function(find_compiler_rt_dir dest)
-  if (NOT DEFINED LIBCXX_COMPILE_FLAGS)
-    message(FATAL_ERROR "LIBCXX_COMPILE_FLAGS must be defined when using this function")
-  endif()
-  set(dest "" PARENT_SCOPE)
-  if (APPLE)
-    set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBCXX_COMPILE_FLAGS}
-        "-print-file-name=lib")
-    execute_process(
-        COMMAND ${CLANG_COMMAND}
-        RESULT_VARIABLE HAD_ERROR
-        OUTPUT_VARIABLE LIBRARY_DIR
-    )
-    string(STRIP "${LIBRARY_DIR}" LIBRARY_DIR)
-    file(TO_CMAKE_PATH "${LIBRARY_DIR}" LIBRARY_DIR)
-    set(LIBRARY_DIR "${LIBRARY_DIR}/darwin")
-  else()
-    set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBCXX_COMPILE_FLAGS}
-        "--rtlib=compiler-rt" "--print-libgcc-file-name")
-    execute_process(
-        COMMAND ${CLANG_COMMAND}
-        RESULT_VARIABLE HAD_ERROR
-        OUTPUT_VARIABLE LIBRARY_FILE
-    )
-    string(STRIP "${LIBRARY_FILE}" LIBRARY_FILE)
-    file(TO_CMAKE_PATH "${LIBRARY_FILE}" LIBRARY_FILE)
-    get_filename_component(LIBRARY_DIR "${LIBRARY_FILE}" DIRECTORY)
-  endif()
-  if (NOT HAD_ERROR AND EXISTS "${LIBRARY_DIR}")
-    message(STATUS "Found compiler-rt directory: ${LIBRARY_DIR}")
-    set(${dest} "${LIBRARY_DIR}" PARENT_SCOPE)
-  else()
-    message(STATUS "Failed to find compiler-rt directory")
-  endif()
-endfunction()

libcxx/cmake/config-ix.cmake

else()
   endif()
 endif()
 
 if (LIBCXX_SUPPORTS_NOSTDLIBXX_FLAG OR LIBCXX_SUPPORTS_NODEFAULTLIBS_FLAG)
   if (LIBCXX_HAS_C_LIB)
     list(APPEND CMAKE_REQUIRED_LIBRARIES c)
   endif ()
   if (LIBCXX_USE_COMPILER_RT)
-    list(APPEND CMAKE_REQUIRED_FLAGS -rtlib=compiler-rt)
+    cmake_push_check_state()
+    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${LIBCXX_COMPILE_FLAGS}")
     find_compiler_rt_library(builtins LIBCXX_BUILTINS_LIBRARY)
+    cmake_pop_check_state()
     list(APPEND CMAKE_REQUIRED_LIBRARIES "${LIBCXX_BUILTINS_LIBRARY}")
   elseif (LIBCXX_HAS_GCC_LIB)
     list(APPEND CMAKE_REQUIRED_LIBRARIES gcc)
   elseif (LIBCXX_HAS_GCC_S_LIB)
     list(APPEND CMAKE_REQUIRED_LIBRARIES gcc_s)
   endif ()
   if (MINGW)
     # Mingw64 requires quite a few "C" runtime libraries in order for basic

libcxx/src/CMakeLists.txt

if (APPLE AND LLVM_USE_SANITIZER)
   elseif("${LLVM_USE_SANITIZER}" STREQUAL "Undefined")
     set(LIBFILE "libclang_rt.ubsan_osx_dynamic.dylib")
   elseif("${LLVM_USE_SANITIZER}" STREQUAL "Thread")
     set(LIBFILE "libclang_rt.tsan_osx_dynamic.dylib")
   else()
     message(WARNING "LLVM_USE_SANITIZER=${LLVM_USE_SANITIZER} is not supported on OS X")
   endif()
   if (LIBFILE)
-    find_compiler_rt_dir(LIBDIR)
+    find_compiler_rt_library(builtins LIBCXX_BUILTINS_LIBRARY)
+    get_filename_component(LIBDIR "${LIBCXX_BUILTINS_LIBRARY}" DIRECTORY)
     if (NOT IS_DIRECTORY "${LIBDIR}")
       message(FATAL_ERROR "Cannot find compiler-rt directory on OS X required for LLVM_USE_SANITIZER")
     endif()
     set(LIBCXX_SANITIZER_LIBRARY "${LIBDIR}/${LIBFILE}")
     set(LIBCXX_SANITIZER_LIBRARY "${LIBCXX_SANITIZER_LIBRARY}" PARENT_SCOPE)
     message(STATUS "Manually linking compiler-rt library: ${LIBCXX_SANITIZER_LIBRARY}")
     add_library_flags("${LIBCXX_SANITIZER_LIBRARY}")
     add_link_flags("-Wl,-rpath,${LIBDIR}")

libcxxabi/CMakeLists.txt

 # See www/CMake.html for instructions on how to build libcxxabi with CMake.
 
 if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libcxx")
   message(FATAL_ERROR "libc++abi now requires being built in a monorepo layout with libcxx available")
 endif()
 
 #===============================================================================
 # Setup Project
 #===============================================================================
 
 cmake_minimum_required(VERSION 3.13.4)
 
 # Add path for custom modules
 set(CMAKE_MODULE_PATH
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules"
   ${CMAKE_MODULE_PATH}
   )
 
 set(CMAKE_FOLDER "libc++")
 
 set(LIBCXXABI_SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR})
 set(LIBCXXABI_BINARY_DIR  ${CMAKE_CURRENT_BINARY_DIR})
 set(LIBCXXABI_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH

libcxxabi/cmake/Modules/HandleCompilerRT.cmake

-function(find_compiler_rt_library name dest)
-  if (NOT DEFINED LIBCXXABI_COMPILE_FLAGS)
-    message(FATAL_ERROR "LIBCXXABI_COMPILE_FLAGS must be defined when using this function")
-  endif()
-  set(dest "" PARENT_SCOPE)
-  set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBCXXABI_COMPILE_FLAGS}
-      "--rtlib=compiler-rt" "--print-libgcc-file-name")
-  if (CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_TARGET)
-    list(APPEND CLANG_COMMAND "--target=${CMAKE_CXX_COMPILER_TARGET}")
-  endif()
-  get_property(LIBCXXABI_CXX_FLAGS CACHE CMAKE_CXX_FLAGS PROPERTY VALUE)
-  string(REPLACE " " ";" LIBCXXABI_CXX_FLAGS "${LIBCXXABI_CXX_FLAGS}")
-  list(APPEND CLANG_COMMAND ${LIBCXXABI_CXX_FLAGS})
-  execute_process(
-      COMMAND ${CLANG_COMMAND}
-      RESULT_VARIABLE HAD_ERROR
-      OUTPUT_VARIABLE LIBRARY_FILE
-  )
-  string(STRIP "${LIBRARY_FILE}" LIBRARY_FILE)
-  file(TO_CMAKE_PATH "${LIBRARY_FILE}" LIBRARY_FILE)
-  string(REPLACE "builtins" "${name}" LIBRARY_FILE "${LIBRARY_FILE}")
-  if (NOT HAD_ERROR AND EXISTS "${LIBRARY_FILE}")
-    message(STATUS "Found compiler-rt library: ${LIBRARY_FILE}")
-    set(${dest} "${LIBRARY_FILE}" PARENT_SCOPE)
-  else()
-    message(STATUS "Failed to find compiler-rt library")
-  endif()
-endfunction()
-
-function(find_compiler_rt_dir dest)
-  if (NOT DEFINED LIBCXXABI_COMPILE_FLAGS)
-    message(FATAL_ERROR "LIBCXXABI_COMPILE_FLAGS must be defined when using this function")
-  endif()
-  set(dest "" PARENT_SCOPE)
-  if (APPLE)
-    set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBCXXABI_COMPILE_FLAGS}
-        "-print-file-name=lib")
-    execute_process(
-        COMMAND ${CLANG_COMMAND}
-        RESULT_VARIABLE HAD_ERROR
-        OUTPUT_VARIABLE LIBRARY_DIR
-    )
-    string(STRIP "${LIBRARY_DIR}" LIBRARY_DIR)
-    file(TO_CMAKE_PATH "${LIBRARY_DIR}" LIBRARY_DIR)
-    set(LIBRARY_DIR "${LIBRARY_DIR}/darwin")
-  else()
-    set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBCXXABI_COMPILE_FLAGS}
-        "--rtlib=compiler-rt" "--print-libgcc-file-name")
-    execute_process(
-        COMMAND ${CLANG_COMMAND}
-        RESULT_VARIABLE HAD_ERROR
-        OUTPUT_VARIABLE LIBRARY_FILE
-    )
-    string(STRIP "${LIBRARY_FILE}" LIBRARY_FILE)
-    file(TO_CMAKE_PATH "${LIBRARY_FILE}" LIBRARY_FILE)
-    get_filename_component(LIBRARY_DIR "${LIBRARY_FILE}" DIRECTORY)
-  endif()
-  if (NOT HAD_ERROR AND EXISTS "${LIBRARY_DIR}")
-    message(STATUS "Found compiler-rt directory: ${LIBRARY_DIR}")
-    set(${dest} "${LIBRARY_DIR}" PARENT_SCOPE)
-  else()
-    message(STATUS "Failed to find compiler-rt directory")
-  endif()
-endfunction()

libcxxabi/cmake/config-ix.cmake

else()
   endif()
 endif()
 
 if (LIBCXXABI_SUPPORTS_NOSTDLIBXX_FLAG OR LIBCXXABI_SUPPORTS_NODEFAULTLIBS_FLAG)
   if (LIBCXXABI_HAS_C_LIB)
     list(APPEND CMAKE_REQUIRED_LIBRARIES c)
   endif ()
   if (LIBCXXABI_USE_COMPILER_RT)
-    list(APPEND CMAKE_REQUIRED_FLAGS -rtlib=compiler-rt)
+    cmake_push_check_state()
+    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${LIBCXXABI_COMPILE_FLAGS}")
     find_compiler_rt_library(builtins LIBCXXABI_BUILTINS_LIBRARY)
+    cmake_pop_check_state()
     list(APPEND CMAKE_REQUIRED_LIBRARIES "${LIBCXXABI_BUILTINS_LIBRARY}")
   else ()
     if (LIBCXXABI_HAS_GCC_S_LIB)
       list(APPEND CMAKE_REQUIRED_LIBRARIES gcc_s)
     endif ()
     if (LIBCXXABI_HAS_GCC_LIB)
       list(APPEND CMAKE_REQUIRED_LIBRARIES gcc)
     endif ()

libcxxabi/src/CMakeLists.txt

if (LLVM_USE_SANITIZER)
     elseif("${LLVM_USE_SANITIZER}" STREQUAL "Undefined")
       set(LIBFILE "libclang_rt.ubsan_osx_dynamic.dylib")
     elseif("${LLVM_USE_SANITIZER}" STREQUAL "Thread")
       set(LIBFILE "libclang_rt.tsan_osx_dynamic.dylib")
     else()
       message(WARNING "LLVM_USE_SANITIZER=${LLVM_USE_SANITIZER} is not supported on OS X")
     endif()
     if (LIBFILE)
-      find_compiler_rt_dir(LIBDIR)
+      find_compiler_rt_library(builtins LIBCXXABI_BUILTINS_LIBRARY)
+      get_filename_component(LIBDIR "${LIBCXXABI_BUILTINS_LIBRARY}" DIRECTORY)
       if (NOT IS_DIRECTORY "${LIBDIR}")
         message(FATAL_ERROR "Cannot find compiler-rt directory on OS X required for LLVM_USE_SANITIZER")
       endif()
       set(LIBCXXABI_SANITIZER_LIBRARY "${LIBDIR}/${LIBFILE}")
       set(LIBCXXABI_SANITIZER_LIBRARY "${LIBCXXABI_SANITIZER_LIBRARY}" PARENT_SCOPE)
       message(STATUS "Manually linking compiler-rt library: ${LIBCXXABI_SANITIZER_LIBRARY}")
       add_library_flags("${LIBCXXABI_SANITIZER_LIBRARY}")
       add_link_flags("-Wl,-rpath,${LIBDIR}")

libunwind/CMakeLists.txt

 if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libcxx")
   message(FATAL_ERROR "libunwind requires being built in a monorepo layout with libcxx available")
 endif()
 
 #===============================================================================
 # Setup Project
 #===============================================================================
 
 cmake_minimum_required(VERSION 3.13.4)
 
 # Add path for custom modules
 set(CMAKE_MODULE_PATH
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../cmake"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules"
   ${CMAKE_MODULE_PATH}
   )
 
 set(LIBUNWIND_SOURCE_DIR  ${CMAKE_CURRENT_SOURCE_DIR})
 set(LIBUNWIND_BINARY_DIR  ${CMAKE_CURRENT_BINARY_DIR})
 set(LIBUNWIND_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH
         "Specify path to libc++ source.")
 

libunwind/cmake/Modules/HandleCompilerRT.cmake

-function(find_compiler_rt_library name dest)
-  if (NOT DEFINED LIBUNWIND_COMPILE_FLAGS)
-    message(FATAL_ERROR "LIBUNWIND_COMPILE_FLAGS must be defined when using this function")
-  endif()
-  set(dest "" PARENT_SCOPE)
-  set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBUNWIND_COMPILE_FLAGS}
-      "--rtlib=compiler-rt" "--print-libgcc-file-name")
-  if (CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_TARGET)
-    list(APPEND CLANG_COMMAND "--target=${CMAKE_CXX_COMPILER_TARGET}")
-  endif()
-  get_property(LIBUNWIND_CXX_FLAGS CACHE CMAKE_CXX_FLAGS PROPERTY VALUE)
-  string(REPLACE " " ";" LIBUNWIND_CXX_FLAGS "${LIBUNWIND_CXX_FLAGS}")
-  list(APPEND CLANG_COMMAND ${LIBUNWIND_CXX_FLAGS})
-  execute_process(
-      COMMAND ${CLANG_COMMAND}
-      RESULT_VARIABLE HAD_ERROR
-      OUTPUT_VARIABLE LIBRARY_FILE
-  )
-  string(STRIP "${LIBRARY_FILE}" LIBRARY_FILE)
-  file(TO_CMAKE_PATH "${LIBRARY_FILE}" LIBRARY_FILE)
-  string(REPLACE "builtins" "${name}" LIBRARY_FILE "${LIBRARY_FILE}")
-  if (NOT HAD_ERROR AND EXISTS "${LIBRARY_FILE}")
-    message(STATUS "Found compiler-rt library: ${LIBRARY_FILE}")
-    set(${dest} "${LIBRARY_FILE}" PARENT_SCOPE)
-  else()
-    message(STATUS "Failed to find compiler-rt library")
-  endif()
-endfunction()
-
-function(find_compiler_rt_dir dest)
-  if (NOT DEFINED LIBUNWIND_COMPILE_FLAGS)
-    message(FATAL_ERROR "LIBUNWIND_COMPILE_FLAGS must be defined when using this function")
-  endif()
-  set(dest "" PARENT_SCOPE)
-  if (APPLE)
-    set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBUNWIND_COMPILE_FLAGS}
-        "-print-file-name=lib")
-    execute_process(
-        COMMAND ${CLANG_COMMAND}
-        RESULT_VARIABLE HAD_ERROR
-        OUTPUT_VARIABLE LIBRARY_DIR
-    )
-    string(STRIP "${LIBRARY_DIR}" LIBRARY_DIR)
-    file(TO_CMAKE_PATH "${LIBRARY_DIR}" LIBRARY_DIR)
-    set(LIBRARY_DIR "${LIBRARY_DIR}/darwin")
-  else()
-    set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBUNWIND_COMPILE_FLAGS}
-        "--rtlib=compiler-rt" "--print-libgcc-file-name")
-    execute_process(
-        COMMAND ${CLANG_COMMAND}
-        RESULT_VARIABLE HAD_ERROR
-        OUTPUT_VARIABLE LIBRARY_FILE
-    )
-    string(STRIP "${LIBRARY_FILE}" LIBRARY_FILE)
-    file(TO_CMAKE_PATH "${LIBRARY_FILE}" LIBRARY_FILE)
-    get_filename_component(LIBRARY_DIR "${LIBRARY_FILE}" DIRECTORY)
-  endif()
-  if (NOT HAD_ERROR AND EXISTS "${LIBRARY_DIR}")
-    message(STATUS "Found compiler-rt directory: ${LIBRARY_DIR}")
-    set(${dest} "${LIBRARY_DIR}" PARENT_SCOPE)
-  else()
-    message(STATUS "Failed to find compiler-rt directory")
-  endif()
-endfunction()

libunwind/cmake/config-ix.cmake

else()
   endif()
 endif()
 
 if (LIBUNWIND_SUPPORTS_NOSTDLIBXX_FLAG OR LIBUNWIND_SUPPORTS_NODEFAULTLIBS_FLAG)
   if (LIBUNWIND_HAS_C_LIB)
     list(APPEND CMAKE_REQUIRED_LIBRARIES c)
   endif ()
   if (LIBUNWIND_USE_COMPILER_RT)
+    cmake_push_check_state()
+    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${LIBUNWIND_COMPILE_FLAGS}")
     find_compiler_rt_library(builtins LIBUNWIND_BUILTINS_LIBRARY)
+    cmake_pop_check_state()
     list(APPEND CMAKE_REQUIRED_LIBRARIES "${LIBUNWIND_BUILTINS_LIBRARY}")
   else ()
     if (LIBUNWIND_HAS_GCC_S_LIB)
       list(APPEND CMAKE_REQUIRED_LIBRARIES gcc_s)
     endif ()
     if (LIBUNWIND_HAS_GCC_LIB)
       list(APPEND CMAKE_REQUIRED_LIBRARIES gcc)
     endif ()