diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-08-18 22:44:46 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-08-18 22:46:32 -0400 |
| commit | e941b031d316f74267350fe2373d30e28b3a2c2e (patch) | |
| tree | 74ba8a26d18e12620290b1d82ee6e01cddc41720 /libc | |
| parent | 481d67d310a7a4213da72f838d6bafaa52ed01d3 (diff) | |
| download | llvm-e941b031d316f74267350fe2373d30e28b3a2c2e.zip llvm-e941b031d316f74267350fe2373d30e28b3a2c2e.tar.gz llvm-e941b031d316f74267350fe2373d30e28b3a2c2e.tar.bz2 | |
Revert "[cmake] Use `CMAKE_INSTALL_LIBDIR` too"
This reverts commit f7a33090a91015836497c75f173775392ab0304d.
Unfortunately this causes a number of failures that didn't show up in my
local build.
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libc/lib/CMakeLists.txt | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt index 4bd7ab6..8aca93b 100644 --- a/libc/CMakeLists.txt +++ b/libc/CMakeLists.txt @@ -1,7 +1,5 @@ cmake_minimum_required(VERSION 3.13.4) -include(GNUInstallDirs) - # Default to C++17 set(CMAKE_CXX_STANDARD 17) diff --git a/libc/lib/CMakeLists.txt b/libc/lib/CMakeLists.txt index 1aa53a5..c5181e9 100644 --- a/libc/lib/CMakeLists.txt +++ b/libc/lib/CMakeLists.txt @@ -5,9 +5,9 @@ add_entrypoint_library( ) if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR) - set(LIBC_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) + set(LIBC_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE}) else() - set(LIBC_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}) + set(LIBC_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}) endif() install( |