diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-01-08 09:00:53 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-06-10 14:35:18 +0000 |
| commit | d5daa5c5b091cafb9b7ffd19b5dfa2daadef3229 (patch) | |
| tree | 26ea96bfcdf9f425b45882b4945addac80aec0b1 /flang/CMakeLists.txt | |
| parent | fd3304ef8545081246f28cd37be98a05d6f24bdd (diff) | |
| download | llvm-d5daa5c5b091cafb9b7ffd19b5dfa2daadef3229.tar.gz | |
[cmake] Don't export `LLVM_TOOLS_INSTALL_DIR` anymore
First of all, `LLVM_TOOLS_INSTALL_DIR` put there breaks our NixOS
builds, because `LLVM_TOOLS_INSTALL_DIR` defined the same as
`CMAKE_INSTALL_BINDIR` becomes an *absolute* path, and then when
downstream projects try to install there too this breaks because our
builds always install to fresh directories for isolation's sake.
Second of all, note that `LLVM_TOOLS_INSTALL_DIR` stands out against the
other specially crafted `LLVM_CONFIG_*` variables substituted in
`llvm/cmake/modules/LLVMConfig.cmake.in`.
@beanz added it in d0e1c2a550ef348aae036d0fe78cab6f038c420c to fix a
dangling reference in `AddLLVM`, but I am suspicious of how this
variable doesn't follow the pattern.
Those other ones are carefully made to be build-time vs install-time
variables depending on which `LLVMConfig.cmake` is being generated, are
carefully made relative as appropriate, etc. etc. For my NixOS use-case
they are also fine because they are never used as downstream install
variables, only for reading not writing.
To avoid the problems I face, and restore symmetry, I deleted the
exported and arranged to have many `${project}_TOOLS_INSTALL_DIR`s.
`AddLLVM` now instead expects each project to define its own, and they
do so based on `CMAKE_INSTALL_BINDIR`. `LLVMConfig` still exports
`LLVM_TOOLS_BINARY_DIR` which is the location for the tools defined in
the usual way, matching the other remaining exported variables.
For the `AddLLVM` changes, I tried to copy the existing pattern of
internal vs non-internal or for LLVM vs for downstream function/macro
names, but it would good to confirm I did that correctly.
Reviewed By: nikic
Differential Revision: https://reviews.llvm.org/D117977
Diffstat (limited to 'flang/CMakeLists.txt')
| -rw-r--r-- | flang/CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt index e6ebd26203a1..7e0aec2bf090 100644 --- a/flang/CMakeLists.txt +++ b/flang/CMakeLists.txt @@ -203,6 +203,11 @@ else() include_directories(SYSTEM ${MLIR_INCLUDE_DIR}) include_directories(SYSTEM ${MLIR_TABLEGEN_OUTPUT_DIR}) endif() + +set(FLANG_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + "Path for binary subdirectory (defaults to '${CMAKE_INSTALL_BINDIR}')") +mark_as_advanced(FLANG_TOOLS_INSTALL_DIR) + set(FLANG_INTRINSIC_MODULES_DIR ${CMAKE_BINARY_DIR}/include/flang) set(FLANG_INCLUDE_DIR ${FLANG_BINARY_DIR}/include) |