From 9777af544ca8518a84a417f6fa1ff3f7519d45ac Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 21 May 2017 22:00:36 -0700 Subject: systemd: Make knobs for compiler specific nn, ar, ranlib These are used with LTO enabled so it has to be compiler specific, making it weak default, makes clang to override them when enabled. (From OE-Core rev: 23cfb8416fb13a32e42ec3860c419ee419e55734) Signed-off-by: Khem Raj Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_232.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meta/recipes-core/systemd/systemd_232.bb') diff --git a/meta/recipes-core/systemd/systemd_232.bb b/meta/recipes-core/systemd/systemd_232.bb index 6513054471..f843c58869 100644 --- a/meta/recipes-core/systemd/systemd_232.bb +++ b/meta/recipes-core/systemd/systemd_232.bb @@ -161,10 +161,14 @@ CFLAGS .= "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', ' -DVALGRIND=1', '' # disable problematic GCC 5.2 optimizations [YOCTO #8291] FULL_OPTIMIZATION_append_arm = " -fno-schedule-insns -fno-schedule-insns2" +COMPILER_NM ?= "${HOST_PREFIX}gcc-nm" +COMPILER_AR ?= "${HOST_PREFIX}gcc-ar" +COMPILER_RANLIB ?= "${HOST_PREFIX}gcc-ranlib" + do_configure_prepend() { - export NM="${HOST_PREFIX}gcc-nm" - export AR="${HOST_PREFIX}gcc-ar" - export RANLIB="${HOST_PREFIX}gcc-ranlib" + export NM="${COMPILER_NM}" + export AR="${COMPILER_AR}" + export RANLIB="${COMPILER_RANLIB}" export KMOD="${base_bindir}/kmod" if [ -d ${S}/units.pre_sed ] ; then cp -r ${S}/units.pre_sed ${S}/units -- cgit v1.2.3-54-g00ecf