caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[cmake] Use CMAKE_INSTALL_LIBDIR too

Browse Source 
We held off on this before as `LLVM_LIBDIR_SUFFIX` conflicted with it.
Now we return this.

`LLVM_LIBDIR_SUFFIX` is kept as a deprecated way to set
`CMAKE_INSTALL_LIBDIR`. The other `*_LIBDIR_SUFFIX` are just removed
entirely.

I imagine this is too potentially-breaking to make LLVM 15. That's fine.
I have a more minimal version of this in the disto (NixOS) patches for
LLVM 15 (like previous versions). This more expansive version I will
test harder after the release is cut.

Reviewed By: sebastian-ne, ldionne, #libc, #libc_abi

Differential Revision: https://reviews.llvm.org/D130586
This commit is contained in:
John Ericson
2021-04-04 13:13:19 -04:00
parent 8a10ee7590
commit f7a33090a9
67 changed files with 189 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Modules/GNUInstallPackageDir.cmake
View File

@@ -29,5 +29,5 @@ macro(_GNUInstallPackageDir_cache_path var default description)
_GNUInstallPackageDir_cache_convert_to_path("${var}" "${description}")
endmacro()
_GNUInstallPackageDir_cache_path(CMAKE_INSTALL_PACKAGEDIR "lib${LLVM_LIBDIR_SUFFIX}/cmake"
_GNUInstallPackageDir_cache_path(CMAKE_INSTALL_PACKAGEDIR "${CMAKE_INSTALL_LIBDIR}/cmake"
"Directories containing installed CMake modules (lib/cmake)")