This is an archive of the discontinued LLVM Phabricator instance.

[compiler-rt] Use the runtimes build for custom libc++
ClosedPublic

Authored by phosek on Dec 1 2021, 6:25 PM.

Details

Summary

Some of the compiler-rt runtimes use custom instrumented libc++ build.
Use the runtimes build for building this custom libc++.

Diff Detail

Event Timeline

phosek created this revision.Dec 1 2021, 6:25 PM
phosek requested review of this revision.Dec 1 2021, 6:25 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 1 2021, 6:25 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
ldionne accepted this revision.Dec 2 2021, 7:07 AM

LGTM but I do have some questions.

Really happy to see this refactoring! 🥳

compiler-rt/cmake/Modules/AddCompilerRT.cmake
637

What is that libcxx|libcxxabi syntax?

Edit: Nevermind, I just saw the LIST_SEPARATOR thing below. Clever, maybe a bit too much. Any reason not to use -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi"?

648

Why do you need this setting?

compiler-rt/cmake/Modules/CustomLibcxx/CMakeLists.txt
1

I am SO happy to see this go away.

This revision is now accepted and ready to land.Dec 2 2021, 7:07 AM

Oh, also, note that compiler-rt isn't being run in the pre-commit CI tests, so please don't rely on that for validating this patch.

phosek updated this revision to Diff 392584.Dec 7 2021, 4:07 PM
phosek added inline comments.
compiler-rt/cmake/Modules/AddCompilerRT.cmake
637

I tried that initially but it doesn't work, CMake interprets it as list of two strings: -DLLVM_ENABLE_RUNTIMES="libcxx and libcxxabi".

648

Great question, I copied it from the original file but I don't think these should be needed anymore.

phosek marked an inline comment as done.Dec 7 2021, 4:07 PM
This revision was landed with ongoing or failed builds.Dec 7 2021, 4:08 PM
This revision was automatically updated to reflect the committed changes.