* Remove the triple patch. it is causing the library search path to fail.

Add a test in debian/qualify-clang.sh to verify we don't regress

debian/changelog

@@ -1,6 +1,7 @@
 llvm-toolchain-snapshot (1:14~++20211002060945+9452ec722ce0-1~exp1) experimental; urgency=medium
 
-  * The triple change has been reverted. Keep it in Debian bring-back-triple-linux.diff
+  * Remove the triple patch. it is causing the library search path to fail.
+    Add a test in debian/qualify-clang.sh to verify we don't regress
   * Fix the "all" build
   * Disable LIBCXX_USE_COMPILER_RT on s390x, armel and x32 as it fails. See bug 52022
   * Adjust the libomp_start_tool visibility on armhf

debian/patches/bring-back-triple-linux.diff

@@ -1,29 +0,0 @@
-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.
-
-Index: llvm-toolchain-snapshot_14~++20211002104316+f33274c7bf44/llvm/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_14~++20211002104316+f33274c7bf44.orig/llvm/CMakeLists.txt
-+++ llvm-toolchain-snapshot_14~++20211002104316+f33274c7bf44/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

debian/patches/series

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

debian/qualify-clang.sh

@@ -1426,6 +1426,26 @@ mkdir cmaketest/foo/
 (cd cmaketest/foo && cmake .. > /dev/null)
 rm -rf cmaketest
 
+# Make sure the triple change doesn't break the world
+# https://reviews.llvm.org/D107799#3027607
+if dpkg -l|grep -q zlib1g-dev; then
+    rm -rf cmaketest && mkdir cmaketest
+    cat > cmaketest/CMakeLists.txt <<EOF
+cmake_minimum_required(VERSION 3.0)
+project(test)
+find_package(ZLIB)
+EOF
+    mkdir cmaketest/foo/
+    cd cmaketest/foo &&  CC=clang-$VERSION CXX=clang++-$VERSION cmake .. &> foo.log
+    if grep "Could NOT find ZLIB" foo.log; then
+        echo "clang hasn't been able to find zlib dev even if it is on the system"
+        echo "https://reviews.llvm.org/D107799#3027607"
+        cat foo.log
+        exit 1
+    fi
+    cd -
+    rm -rf cmaketest
+fi
 
 # Test case for bug #994827
 rm -rf cmaketest && mkdir cmaketest