From 874857181daccfe33cc9d1c64d1f99e9f0384666 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 11 Feb 2019 06:51:47 -0800 Subject: clang.bbclass: Set nativesk ldso location correctly during link Add aarch64 host support Enable lld via LDFLGS instead of TOOLCHAIN_FLAGS which also get passed to compiler Add relative rpaths so the liraries from SDK sysroot are preferred over sdk host when SDK is used Signed-off-by: Khem Raj --- classes/clang.bbclass | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/classes/clang.bbclass b/classes/clang.bbclass index 2d08c10..04d8c46 100644 --- a/classes/clang.bbclass +++ b/classes/clang.bbclass @@ -15,11 +15,16 @@ TUNE_CCARGS_remove_toolchain-clang_powerpc = "-mno-spe" TUNE_CCARGS_append_toolchain-clang = " -Wno-error=unused-command-line-argument -Qunused-arguments" -TOOLCHAIN_OPTIONS_append_toolchain-clang_class-nativesdk_x86-64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-x86-64.so.2" -TOOLCHAIN_OPTIONS_append_toolchain-clang_class-nativesdk_x86 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux.so.2" +LDFLAGS_append_toolchain-clang_class-nativesdk_x86-64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-x86-64.so.2" +LDFLAGS_append_toolchain-clang_class-nativesdk_x86 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux.so.2" +LDFLAGS_append_toolchain-clang_class-nativesdk_aarch64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-aarch64.so.1" + +LDFLAGS_toolchain-clang_class-nativesdk = "${BUILDSDK_LDFLAGS} \ + -Wl,-rpath-link,${STAGING_LIBDIR}/.. \ + -Wl,-rpath,${libdir}/.. " # Enable lld globally" -TOOLCHAIN_OPTIONS_append_toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=lld', '', d)}" +LDFLAGS_append_toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=lld', '', d)}" # choose between 'gcc' 'clang' an empty '' can be used as well TOOLCHAIN ??= "gcc" -- cgit v1.2.3-54-g00ecf