[all-commits] [llvm/llvm-project] 9a9bc7: Prepare Compiler-RT for GnuInstallDirs, matching l...

John Ericson via All-commits all-commits at lists.llvm.org
Fri Jul 9 13:42:07 PDT 2021


  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: 9a9bc76c0eb72f0f2732c729a460abbd5239c2e3
      https://github.com/llvm/llvm-project/commit/9a9bc76c0eb72f0f2732c729a460abbd5239c2e3
  Author: John Ericson <John.Ericson at Obsidian.Systems>
  Date:   2021-07-09 (Fri, 09 Jul 2021)

  Changed paths:
    M compiler-rt/cmake/Modules/AddCompilerRT.cmake
    M compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
    M compiler-rt/cmake/Modules/CompilerRTUtils.cmake
    M compiler-rt/cmake/base-config-ix.cmake
    M compiler-rt/include/CMakeLists.txt
    M compiler-rt/lib/dfsan/CMakeLists.txt

  Log Message:
  -----------
  Prepare Compiler-RT for GnuInstallDirs, matching libcxx

Instead of using `COMPILER_RT_INSTALL_PATH` through the CMake for
complier-rt, just use it to define variables for the subdirs which
themselves are used.

This preserves compatibility, but later on we might consider getting rid
of `COMPILER_RT_INSTALL_PATH` and just changing the defaults for the
subdir variables directly.

---

There was a seaming bug where the (non-Apple) per-target libdir was
`${target}` not `lib/${target}`. I suspect that has to do with the docs
on `COMPILER_RT_INSTALL_PATH` saying was the library dir when that's no
longer true, so I just went ahead and fixed it, allowing me to define
fewer and more sensible variables.

That last part should be the only behavior changes; everything else
should be a pure refactoring.

---

D99484 is the main thrust of the `GnuInstallDirs` work. Once this lands,
it should be feasible to follow both of these up with a simple patch for
compiler-rt analogous to the one for libcxx.

Reviewed By: phosek

Differential Revision: https://reviews.llvm.org/D101497




More information about the All-commits mailing list