[v2,02/28] clang.bbclass: Specify ldso when using usermerge

Message ID	20250520-clang-toolchain-v2-2-db97c2eb3756@gmail.com
State	New
Headers	show Return-Path: <raj.khem@gmail.com> ip: 209.85.215.177, mailfrom: raj.khem@gmail.com) From: Khem Raj <raj.khem@gmail.com> Date: Tue, 20 May 2025 23:19:38 -0700 Subject: [PATCH v2 02/28] clang.bbclass: Specify ldso when using usermerge MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250520-clang-toolchain-v2-2-db97c2eb3756@gmail.com> References: <20250520-clang-toolchain-v2-0-db97c2eb3756@gmail.com> In-Reply-To: <20250520-clang-toolchain-v2-0-db97c2eb3756@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Khem Raj <raj.khem@gmail.com>
Series	clang: Add clang C/C++ toolchain \| expand [v2,00/28] clang: Add clang C/C++ toolchain [v2,01/28] toolchain: Provide abstraction for choosing per-recipe toolchain [v2,02/28] clang.bbclass: Specify ldso when using usermerge [v2,03/28] vte: Disable gi data generation when using clang on arm [v2,04/28] clang: Add compiler-rt to default deps when using clang compiler [v2,05/28] gnu-efi: Use objcopy from GNU binutils with clang [v2,06/28] tcf-agent: Fix ranlib call when using llvm-ranlib [v2,07/28] pulseaudio: Treat -Wunused-command-line-argument as error [v2,08/28] libjpeg-turbo: Fix build on mips/clang [v2,09/28] pixman: Fix build with mips/clang [v2,10/28] systemd-boot: Remove -mfpmath=sse option from cflags [v2,11/28] vulkan-samples: Disable overriding-option as error [v2,12/28] openssl: Link with libatomic on x86/clang [v2,13/28] qemu: Link with libatomic on x86/clang [v2,14/28] bluez: Disable invalid-pp-token warning with clang [v2,15/28] gcc: Always use GCC toolchain [v2,16/28] glibc: Always use GCC toolchain [v2,17/28] grub,grub-efi: Pin to using gcc on aarch64 [v2,18/28] valgrind: Use gcc to compile on riscv64 [v2,19/28] syslinux: Pin to using GCC toolchain [v2,20/28] systemtap: Pin to build with GCC [v2,21/28] webkitgtk: Use gcc to compile for arm target [v2,22/28] pseudo: Pin to using GCC compiler [v2,23/28] rpm: Always use gcc compiler [v2,24/28] pulseaudio: Pin to use GCC compiler [v2,25/28] seatd: Disable sign-compare warning as error on clang [v2,26/28] busybox: Fix build on architectures without SYS_settimeofday [v2,27/28] systemd-boot: Use gcc on musl/arm [v2,28/28] perf: Do not treat maybe-uninitialized warnings as errors

Message ID

20250520-clang-toolchain-v2-2-db97c2eb3756@gmail.com

State

New

Headers

From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 20 May 2025 23:19:38 -0700
Subject: [PATCH v2 02/28] clang.bbclass: Specify ldso when using usermerge
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20250520-clang-toolchain-v2-2-db97c2eb3756@gmail.com>
References: <20250520-clang-toolchain-v2-0-db97c2eb3756@gmail.com>
In-Reply-To: <20250520-clang-toolchain-v2-0-db97c2eb3756@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Khem Raj <raj.khem@gmail.com>

Series

clang: Add clang C/C++ toolchain | expand

Commit Message

Khem Raj May 21, 2025, 6:19 a.m. UTC

This matches the expectations of distro setups and clang's understanding
of what the ldso should look like

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/classes/clang.bbclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/classes/clang.bbclass b/meta/classes/clang.bbclass
index be8b888918d1b4b4ae1d245df2c9da013cdc826e..ddf8f350f951744940893698188a1e6056edf7cc 100644
--- a/meta/classes/clang.bbclass
+++ b/meta/classes/clang.bbclass
@@ -25,3 +25,8 @@  PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "clang-crosssdk-${SDK_SYS}"
 PREFERRED_PROVIDER_virtual/nativesdk-compilerlibs = "nativesdk-gcc-runtime"
 
 TCOVERRIDE = "toolchain-clang"
+
+TUNE_CCARGS += "${@bb.utils.contains("DISTRO_FEATURES", "usrmerge", " --dyld-prefix=/usr", "", d)}"
+
+LDFLAGS:append:class-nativesdk:x86-64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-x86-64.so.2"
+LDFLAGS:append:class-nativesdk:aarch64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-aarch64.so.1"

[v2,02/28] clang.bbclass: Specify ldso when using usermerge

Commit Message

Patch