Skip to contentSkip to conversation

toolchain-scripts.bbclass: Make -mmusl apply only for gcc toolchains

PATCH Superseded Khem Raj 1 participant 4 messages Jul 18, 2025

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/4 toolchain-scripts.bbclass: Make -mmusl apply only for gcc toolchains

This option is not respected by clang

---
 meta/classes-recipe/toolchain-scripts.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-recipe/toolchain-scripts.bbclass +1 -1
index 3053cd0f1fa..5874a48af84 100644
@@ -9,7 +9,7 @@ inherit toolchain-scripts-base siteinfo kernel-arch meson-routines
 # We want to be able to change the value of MULTIMACH_TARGET_SYS, because it
 # doesn't always match our expectations... but we default to the stock value
 REAL_MULTIMACH_TARGET_SYS ?= "${MULTIMACH_TARGET_SYS}"
-TARGET_CC_ARCH:append:libc-musl = " -mmusl"
+TARGET_CC_ARCH:append:toolchain-gcc:libc-musl = " -mmusl"
 
 # default debug prefix map isn't valid in the SDK
 DEBUG_PREFIX_MAP = ""
author
#1 lore raw

PATCH 2/4 cmake.bbclass: Define CMAKE_CLANG_TIDY with toolchain-clang

clang-tidy is used by many packages these days and probed during build.

---
 meta/classes-recipe/cmake.bbclass | 6 ++++++
 1 file changed, 6 insertions(+)
meta/classes-recipe/cmake.bbclass +6 -0
index 449fe2bb443..2c6d28b7a95 100644
@@ -216,6 +216,12 @@ list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ${STAGING_INCDIR_NATIVE})
 EOF
 }
 
+cmake_do_generate_toolchain_file:append:toolchain-clang() {
+	cat >> ${WORKDIR}/toolchain.cmake <<EOF
+set( CMAKE_CLANG_TIDY ${HOST_PREFIX}clang-tidy )
+EOF
+}
+
 addtask generate_toolchain_file after do_patch before do_configure
 
 CONFIGURE_FILES = "CMakeLists.txt *.cmake"
author
#2 lore raw

PATCH 3/4 clang: Default to use lld if ld-is-lld is in DISTRO_FEATURES

In reply to Khem Raj

This ensures that default system linker is used correctly based upon distro features, current default remain same i.e. uses BFD linker

---
 meta/recipes-devtools/clang/clang_git.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-devtools/clang/clang_git.bb +1 -0
index ed6e2d7da7f..1210ca92de1 100644
@@ -54,6 +54,7 @@ def get_clang_target_arch(bb, d):
     return get_clang_arch(bb, d, 'TARGET_ARCH')
 
 PACKAGECONFIG_CLANG_COMMON = "build-id eh libedit rtti shared-libs libclang-python \
+                              ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', 'lld', '', d)} \
                               ${@bb.utils.contains('TC_CXX_RUNTIME', 'llvm', 'compiler-rt libcplusplus libomp unwindlib', '', d)} \
                               "
 
author
#3 lore raw

PATCH 4/4 clang.bbclass: Add clang specific ldflags and dependencies

In reply to Khem Raj

* Qunused-arguments option is needed for making clang not error out on options it does not understand. This is required for some packages which might be using the gcc-only flags. We still want to know the problem but let clang ignore it and move on instead of dropping out

* Add rpath defaults for nativesdk recipes to let nativesdk packages use SDK sysroot correctly

* Add clang-cross to sysroot via POPULATESYSROOTDEPS to get llvm tools e.g. llvm-strip, llvm-nm etc when they are used at default STRIP/NM etc.

---
 meta/classes/toolchain/clang.bbclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
meta/classes/toolchain/clang.bbclass +5 -1
index d7b8a3657c6..f7e3e7435f4 100644
@@ -29,9 +29,13 @@ PREFERRED_PROVIDER_virtual/nativesdk-cross-c++:class-cross-canadian = "clang-cro
 
 BASE_DEFAULT_DEPS:append:class-target = " compiler-rt"
 
-TUNE_CCARGS += "${@bb.utils.contains("DISTRO_FEATURES", "usrmerge", " --dyld-prefix=/usr", "", d)}"
+TUNE_CCARGS += "${@bb.utils.contains("DISTRO_FEATURES", "usrmerge", " --dyld-prefix=/usr", "", d)} -Qunused-arguments"
 
 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"
+LDFLAGS:append:class-nativesdk = " -Wl,-rpath-link,${STAGING_LIBDIR}/.. -Wl,-rpath,${libdir}/.."
+
+# do_populate_sysroot needs STRIP
+POPULATESYSROOTDEPS:append:class-target = " ${MLPREFIX}clang-cross-${TARGET_ARCH}:do_populate_sysroot"
 
 TCOVERRIDE = "toolchain-clang"