From c8328b07618ae60f43465eb8c9eec77572d31032 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 17 Feb 2017 09:58:38 +0100 Subject: gator: fix linking, try 2 The previous fix only worked with a partial recompile, this works with a -c cleansstate. Change-Id: Idda2027e2837c6f9897d147fe0f5efb77888be67 Signed-off-by: Koen Kooi --- meta-linaro/recipes-kernel/gator/gator_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta-linaro') diff --git a/meta-linaro/recipes-kernel/gator/gator_git.bb b/meta-linaro/recipes-kernel/gator/gator_git.bb index 521fbf99..fc59f9d5 100644 --- a/meta-linaro/recipes-kernel/gator/gator_git.bb +++ b/meta-linaro/recipes-kernel/gator/gator_git.bb @@ -17,7 +17,7 @@ inherit update-rc.d # Since this is c++ code we need to both compile and link with CXX #| PerfSource.o: In function `PerfSource::~PerfSource()': #| /usr/src/debug/gator/5.22+gitAUTOINC+7ca6004c0b-r0/git/daemon/PerfSource.cpp:128: undefined reference to `operator delete(void*, unsigned long)' -CC = "${CXX}" +CCLD = "${CXX}" EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} ${TARGET_CC_ARCH} -D_DEFAULT_SOURCE -DETCDIR=\"${sysconfdir}\"' \ 'LDFLAGS=${LDFLAGS} ${TARGET_CC_ARCH}' 'CROSS_COMPILE=${TARGET_PREFIX}' \ @@ -26,6 +26,8 @@ EXTRA_OEMAKE = "'CFLAGS=${CFLAGS} ${TARGET_CC_ARCH} -D_DEFAULT_SOURCE -DETCDIR=\ do_compile() { # The regular makefile tries to be 'smart' by hardcoding ABI assumptions, let's use the clean makefile for everything. cp ${S}/daemon/Makefile_aarch64 ${S}/daemon/Makefile + # Allow using a differnt linker than $(CC) + sed -i -e 's:$(CC) $(LDFLAGS):$(CCLD) $(LDFLAGS):' ${S}/daemon/common.mk oe_runmake -C daemon CC='${CC}' CXX='${CXX}' } -- cgit v1.2.3