[all-commits] [llvm/llvm-project] f7a330: [cmake] Use `CMAKE_INSTALL_LIBDIR` too

John Ericson via All-commits all-commits at lists.llvm.org
Thu Aug 18 12:33:51 PDT 2022


  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: f7a33090a91015836497c75f173775392ab0304d
      https://github.com/llvm/llvm-project/commit/f7a33090a91015836497c75f173775392ab0304d
  Author: John Ericson <John.Ericson at Obsidian.Systems>
  Date:   2022-08-18 (Thu, 18 Aug 2022)

  Changed paths:
    M bolt/runtime/CMakeLists.txt
    M clang/CMakeLists.txt
    M clang/cmake/caches/Android-stage2.cmake
    M clang/cmake/caches/Android.cmake
    M clang/cmake/modules/AddClang.cmake
    M clang/cmake/modules/CMakeLists.txt
    M clang/include/clang/Config/config.h.cmake
    M clang/lib/Driver/Driver.cpp
    M clang/lib/Driver/ToolChains/CommonArgs.cpp
    M clang/lib/Driver/ToolChains/Cuda.cpp
    M clang/lib/Headers/CMakeLists.txt
    M clang/runtime/CMakeLists.txt
    M clang/tools/libclang/CMakeLists.txt
    M clang/tools/scan-build-py/CMakeLists.txt
    M cmake/Modules/GNUInstallPackageDir.cmake
    M compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake
    M compiler-rt/cmake/Modules/CompilerRTUtils.cmake
    M compiler-rt/cmake/base-config-ix.cmake
    M compiler-rt/docs/BuildingCompilerRT.rst
    M flang/CMakeLists.txt
    M flang/cmake/modules/AddFlang.cmake
    M flang/cmake/modules/CMakeLists.txt
    M libc/CMakeLists.txt
    M libc/lib/CMakeLists.txt
    M libcxx/CMakeLists.txt
    M libcxx/docs/BuildingLibcxx.rst
    M libcxxabi/CMakeLists.txt
    M libunwind/CMakeLists.txt
    M libunwind/docs/BuildingLibunwind.rst
    M lld/CMakeLists.txt
    M lld/cmake/modules/AddLLD.cmake
    M lld/cmake/modules/CMakeLists.txt
    M lldb/cmake/modules/AddLLDB.cmake
    M lldb/cmake/modules/LLDBConfig.cmake
    M lldb/cmake/modules/LLDBGenerateConfig.cmake
    M lldb/cmake/modules/LLDBStandalone.cmake
    M lldb/include/lldb/Host/Config.h.cmake
    M lldb/source/API/CMakeLists.txt
    M lldb/source/Host/linux/HostInfoLinux.cpp
    M lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp
    M lldb/tools/intel-features/CMakeLists.txt
    M lldb/unittests/Expression/ClangParserTest.cpp
    M llvm/CMakeLists.txt
    M llvm/cmake/modules/AddLLVM.cmake
    M llvm/cmake/modules/AddOCaml.cmake
    M llvm/cmake/modules/CMakeLists.txt
    M llvm/cmake/modules/LLVMConfig.cmake.in
    M llvm/docs/CMake.rst
    M llvm/tools/llvm-config/BuildVariables.inc.in
    M llvm/tools/llvm-config/llvm-config.cpp
    M llvm/tools/llvm-shlib/CMakeLists.txt
    M llvm/utils/gn/secondary/clang/include/clang/Config/BUILD.gn
    M llvm/utils/gn/secondary/lldb/include/lldb/Host/BUILD.gn
    M llvm/utils/gn/secondary/llvm/tools/llvm-config/BUILD.gn
    M mlir/CMakeLists.txt
    M mlir/cmake/modules/AddMLIR.cmake
    M mlir/cmake/modules/AddMLIRPython.cmake
    M mlir/cmake/modules/CMakeLists.txt
    M mlir/test/CMakeLists.txt
    M openmp/CMakeLists.txt
    M openmp/README.rst
    M polly/cmake/CMakeLists.txt
    M polly/cmake/polly_macros.cmake
    M polly/test/CMakeLists.txt
    M pstl/CMakeLists.txt
    M third-party/benchmark/src/CMakeLists.txt
    M utils/bazel/llvm-project-overlay/clang/include/clang/Config/config.h

  Log Message:
  -----------
  [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




More information about the All-commits mailing list