From 28dcaf569228823ca8de49f521985b7ddfe489a0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 22 May 2025 20:52:36 -0700 Subject: [PATCH] clang.inc: Specify ldso when using usrmerge This matches the expectations of distro setups and clang's understanding of what the ldso should look like (From OE-Core rev: 2e95208253211872a501407a1180dc192a634195) Signed-off-by: Khem Raj Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/conf/toolchain/clang.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/conf/toolchain/clang.inc b/meta/conf/toolchain/clang.inc index 0e5f0769f8..48295a933d 100644 --- a/meta/conf/toolchain/clang.inc +++ b/meta/conf/toolchain/clang.inc @@ -23,3 +23,8 @@ PREFERRED_PROVIDER_virtual/cross-c++:class-nativesdk = "gcc-crosssdk-${SDK_SYS}" PREFERRED_PROVIDER_virtual/nativesdk-cross-cc = "gcc-crosssdk-${SDK_SYS}" PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "gcc-crosssdk-${SDK_SYS}" PREFERRED_PROVIDER_virtual/nativesdk-compilerlibs = "nativesdk-gcc-runtime" + +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"