Merge remote-tracking branch 'upstream/dunfell' into kraj/clang12

2 files changed, 1 insertions, 26 deletions

diff --git a/recipes-devtools/clang/clang/0029-OpenMP-link-fix.patch  b/recipes-devtools/clang/clang/0029-OpenMP-link-fix.patch 
deleted file mode 100644
index 3901268..0000000
--- a/recipes-devtools/clang/clang/0029-OpenMP-link-fix.patch 
+++ /dev/null
@@ -1,26 +0,0 @@
-From 11bd98436bd7e99fb1fc2c07c150c71e2250a262 Mon Sep 17 00:00:00 2001
-From: Joel Winarske <joel.winarske@gmail.com>
-Date: Wed, 9 Feb 2022 11:11:55 -0800
-Subject: [PATCH] OpenMP link fix
-
-Signed-off-by: Joel Winarske <joel.winarske@gmail.com>
----
- openmp/runtime/src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
-index 9f46b4bd4..3106e497d 100644
---- a/openmp/runtime/src/CMakeLists.txt
-+++ b/openmp/runtime/src/CMakeLists.txt
-@@ -168,7 +168,7 @@ endif()
- 
- # Linking command will include libraries in LIBOMP_CONFIGURED_LIBFLAGS
- libomp_get_libflags(LIBOMP_CONFIGURED_LIBFLAGS)
--target_link_libraries(omp ${LIBOMP_CONFIGURED_LIBFLAGS} ${CMAKE_DL_LIBS})
-+target_link_libraries(omp ${LIBOMP_CONFIGURED_LIBFLAGS} ${CMAKE_DL_LIBS} "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports_so.txt")
- 
- # Create *.inc before compiling any sources
- # objects depend on : .inc files
--- 
-2.31.1
-
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index c94dd69..e211258 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -25,6 +25,7 @@ SRC_URI = "\
     file://0014-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch \
     file://0015-clang-scan-view-needs-python-2.x.patch \
     file://0016-clang-Add-lpthread-and-ldl-along-with-lunwind-for-st.patch \
+    file://0017-Pass-PYTHON_EXECUTABLE-when-cross-compiling-for-nati.patch \
     file://0018-Check-for-atomic-double-intrinsics.patch \
     file://0019-clang-Enable-SSP-and-PIE-by-default.patch \
     file://0020-libcxx-Add-compiler-runtime-library-to-link-step-for.patch \