The triple change has been reverted. Keep it in Debian bring-back-triple-linux.diff

This commit is contained in:
Sylvestre Ledru 2021-10-02 09:51:17 +02:00
parent 9f1c643bb0
commit e658461a46
3 changed files with 36 additions and 0 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
llvm-toolchain-snapshot (1:14~++20210926041028+6063e6b499c7-1~exp2) experimental; urgency=medium
* The triple change has been reverted. Keep it in Debian bring-back-triple-linux.diff
--
llvm-toolchain-snapshot (1:14~++20210926041028+6063e6b499c7-1~exp1) experimental; urgency=medium
* experimental New snapshot release

View File

@ -0,0 +1,29 @@
commit c93da7d9cf161ffda2366a96eb060c3b824cb549
Author: Roman Lebedev <lebedev.ri@gmail.com>
Date: Tue Sep 28 18:23:17 2021 +0300
Revert "[CMake] Enable LLVM_ENABLE_PER_TARGET_RUNTIME_DIR by default on Linux"
See original review https://reviews.llvm.org/D107799
This reverts commit f9dbca68d48e705f6d45df8f58d6b2ee88bce76c.
diff --git b/llvm/CMakeLists.txt a/llvm/CMakeLists.txt
index f10f8d66d0b8..069fb8b7c0f8 100644
--- b/llvm/CMakeLists.txt
+++ a/llvm/CMakeLists.txt
@@ -677,7 +677,13 @@ endif()
set(LLVM_TARGET_TRIPLE_ENV CACHE STRING "The name of environment variable to override default target. Disabled by blank.")
mark_as_advanced(LLVM_TARGET_TRIPLE_ENV)
-set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR OFF CACHE BOOL
+# Per target dir not yet supported on Arm 32 bit due to arm vs armhf handling
+if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+ set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_default ON)
+else()
+ set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_default OFF)
+endif()
+set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR ${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_default} CACHE BOOL
"Enable per-target runtimes directory")
set(LLVM_PROFDATA_FILE "" CACHE FILEPATH

View File

@ -143,3 +143,4 @@ scan-build-py-fix-default-bin.diff
libclc-llvm-spirv.diff
omp-riscv64.patch
bring-back-triple-linux.diff