From f7a33090a91015836497c75f173775392ab0304d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 4 Apr 2021 13:13:19 -0400 Subject: [cmake] Use `CMAKE_INSTALL_LIBDIR` too 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 --- cmake/Modules/GNUInstallPackageDir.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake') diff --git a/cmake/Modules/GNUInstallPackageDir.cmake b/cmake/Modules/GNUInstallPackageDir.cmake index e4a058e68f4f..e4e84b6fc057 100644 --- a/cmake/Modules/GNUInstallPackageDir.cmake +++ b/cmake/Modules/GNUInstallPackageDir.cmake @@ -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)") -- cgit v1.2.1