From 2df16ea744c295f41e32f3b8448aeec785ac44da Mon Sep 17 00:00:00 2001
From: Jan Luebbe <jluebbe@debian.org>
Date: Wed, 24 Jun 2015 16:17:19 +0200
Subject: [PATCH] barebox: use KERNEL_CC and KERNEL_LD

Barebox should be built like the kernel. We have to disable the target
userspace tools because they cannot be build using KERNEL_CC (which is
missing --sysroot=).
---
 recipes-bsp/barebox/barebox.inc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/recipes-bsp/barebox/barebox.inc b/recipes-bsp/barebox/barebox.inc
index ed9fcea..4000e30 100644
--- a/recipes-bsp/barebox/barebox.inc
+++ b/recipes-bsp/barebox/barebox.inc
@@ -15,14 +15,17 @@ EXTRA_OEMAKE = "ARCH=arm CROSS_COMPILE=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREF
 
 do_configure_prepend() {
 	cp ${WORKDIR}/defconfig ${S}/.config
+	# do not compile tools when using KERNEL_CC/KERNEL_LD
+	echo CONFIG_BAREBOXENV_TARGET=n >> ${S}/.config
+	echo CONFIG_BAREBOXCRC32_TARGET=n >> ${S}/.config
+	echo CONFIG_KERNEL_INSTALL_TARGET=n >> ${S}/.config
+	echo CONFIG_IMD_TARGET=n >> ${S}/.config
 	oe_runmake oldconfig
 }
 
 do_compile () {
-	unset LDFLAGS
-	unset CFLAGS
-	unset CPPFLAGS
-	oe_runmake CC="$CC"
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
+	oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}"
 }
 
 do_deploy () {