compiler-rt-sanitizers: Link with static C++ runtime when available

This fixes build on ARM

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 241e7e50d394795822beb04869fa540026ebf0cd)

2 files changed, 3 insertions, 3 deletions

diff --git a/recipes-devtools/clang/clang/0033-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch b/recipes-devtools/clang/clang/0031-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch
index e95b418..7da132a 100644
--- a/recipes-devtools/clang/clang/0033-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch
+++ b/recipes-devtools/clang/clang/0031-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch
@@ -1,4 +1,4 @@
-From 08c592b1850c9b0c17a9f4163e93682a9f83d7f7 Mon Sep 17 00:00:00 2001
+From 24ce3255ade936fee508d83c7f2551c8f2142bac Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 19 May 2021 21:49:18 -0700
 Subject: [PATCH] compiler-rt: Link scudo with SANITIZER_CXX_ABI_LIBRARIES
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/compiler-rt/lib/scudo/CMakeLists.txt b/compiler-rt/lib/scudo/CMakeLists.txt
-index c50ea0233fae..ddc1128b8ed8 100644
+index e580d6d1408b..c14d7636e291 100644
 --- a/compiler-rt/lib/scudo/CMakeLists.txt
 +++ b/compiler-rt/lib/scudo/CMakeLists.txt
 @@ -12,6 +12,7 @@ append_list_if(COMPILER_RT_HAS_LIBDL dl SCUDO_MINIMAL_DYNAMIC_LIBS)
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index e37c459..e69acff 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -39,7 +39,7 @@ SRC_URI = "\
     file://0028-clang-Switch-defaults-to-dwarf-5-debug-info-on-Linux.patch \
     file://0029-compiler-rt-Do-not-use-backtrace-APIs-on-non-glibc-l.patch \
     file://0030-clang-Fix-x86-triple-for-non-debian-multiarch-linux-.patch \
-    file://0033-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch \
+    file://0031-compiler-rt-Link-scudo-with-SANITIZER_CXX_ABI_LIBRAR.patch \
     file://0034-CMake-Installable-find-modules-for-terminfo-and-libf.patch \
     file://0035-llvm-Do-not-use-standard-search-paths-in-find_librar.patch \
 "