Ericson2314 updated this revision to Diff 401103.
Ericson2314 added a comment.
Herald added subscribers: Sanitizers, JDevlieghere.
Herald added a project: Sanitizers.
Don't forget compiler-rt
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D117639/new/
https://reviews.llvm.org/D117639
Files:
compiler-rt/cmake/base-config-ix.cmake
flang/CMakeLists.txt
libcxx/CMakeLists.txt
libcxxabi/CMakeLists.txt
libunwind/CMakeLists.txt
lld/CMakeLists.txt
lldb/CMakeLists.txt
llvm/CMakeLists.txt
polly/CMakeLists.txt
pstl/CMakeLists.txt
Index: pstl/CMakeLists.txt
===================================================================
--- pstl/CMakeLists.txt
+++ pstl/CMakeLists.txt
@@ -7,6 +7,10 @@
#===----------------------------------------------------------------------===##
cmake_minimum_required(VERSION 3.13.4)
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ # No suffixes by default: LLVM does those separately.
+ set(CMAKE_INSTALL_LIBDIR lib)
+endif()
include(GNUInstallDirs)
set(PARALLELSTL_VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/include/pstl/internal/pstl_config.h")
Index: polly/CMakeLists.txt
===================================================================
--- polly/CMakeLists.txt
+++ polly/CMakeLists.txt
@@ -1,3 +1,7 @@
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ # No suffixes by default: LLVM does those separately.
+ set(CMAKE_INSTALL_LIBDIR lib)
+endif()
include(GNUInstallDirs)
# Check if this is a in tree build.
Index: llvm/CMakeLists.txt
===================================================================
--- llvm/CMakeLists.txt
+++ llvm/CMakeLists.txt
@@ -2,6 +2,10 @@
cmake_minimum_required(VERSION 3.13.4)
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ # No suffixes by default: LLVM does those separately.
+ set(CMAKE_INSTALL_LIBDIR lib)
+endif()
include(GNUInstallDirs)
# CMP0116: Ninja generators transform `DEPFILE`s from `add_custom_command()`
Index: lldb/CMakeLists.txt
===================================================================
--- lldb/CMakeLists.txt
+++ lldb/CMakeLists.txt
@@ -1,5 +1,9 @@
cmake_minimum_required(VERSION 3.13.4)
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ # No suffixes by default: LLVM does those separately.
+ set(CMAKE_INSTALL_LIBDIR lib)
+endif()
include(GNUInstallDirs)
# Add path for custom modules.
Index: lld/CMakeLists.txt
===================================================================
--- lld/CMakeLists.txt
+++ lld/CMakeLists.txt
@@ -1,5 +1,9 @@
cmake_minimum_required(VERSION 3.13.4)
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ # No suffixes by default: LLVM does those separately.
+ set(CMAKE_INSTALL_LIBDIR lib)
+endif()
include(GNUInstallDirs)
# If we are not building as a part of LLVM, build LLD as an
Index: libunwind/CMakeLists.txt
===================================================================
--- libunwind/CMakeLists.txt
+++ libunwind/CMakeLists.txt
@@ -8,6 +8,10 @@
cmake_minimum_required(VERSION 3.13.4)
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ # No suffixes by default: LLVM does those separately.
+ set(CMAKE_INSTALL_LIBDIR lib)
+endif()
include(GNUInstallDirs)
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
Index: libcxxabi/CMakeLists.txt
===================================================================
--- libcxxabi/CMakeLists.txt
+++ libcxxabi/CMakeLists.txt
@@ -10,6 +10,10 @@
cmake_minimum_required(VERSION 3.13.4)
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ # No suffixes by default: LLVM does those separately.
+ set(CMAKE_INSTALL_LIBDIR lib)
+endif()
include(GNUInstallDirs)
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
Index: libcxx/CMakeLists.txt
===================================================================
--- libcxx/CMakeLists.txt
+++ libcxx/CMakeLists.txt
@@ -10,6 +10,10 @@
#===============================================================================
cmake_minimum_required(VERSION 3.13.4)
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ # No suffixes by default: LLVM does those separately.
+ set(CMAKE_INSTALL_LIBDIR lib)
+endif()
include(GNUInstallDirs)
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
Index: flang/CMakeLists.txt
===================================================================
--- flang/CMakeLists.txt
+++ flang/CMakeLists.txt
@@ -7,6 +7,10 @@
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
set(CMAKE_CXX_EXTENSIONS OFF)
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ # No suffixes by default: LLVM does those separately.
+ set(CMAKE_INSTALL_LIBDIR lib)
+endif()
include(GNUInstallDirs)
set(FLANG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
Index: compiler-rt/cmake/base-config-ix.cmake
===================================================================
--- compiler-rt/cmake/base-config-ix.cmake
+++ compiler-rt/cmake/base-config-ix.cmake
@@ -5,9 +5,14 @@
include(CheckIncludeFile)
include(CheckCXXSourceCompiles)
-include(GNUInstallDirs)
include(ExtendPath)
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ # No suffixes by default: LLVM does those separately.
+ set(CMAKE_INSTALL_LIBDIR lib)
+endif()
+include(GNUInstallDirs)
+
check_include_file(unwind.h HAVE_UNWIND_H)
# Used by sanitizer_common and tests.
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
