summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Preston <thomas.preston@codethink.co.uk>2018-09-05 12:22:36 (GMT)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-09-05 20:25:04 (GMT)
commit0e749a6f30a7b102da65f6101f89fa1a2228833e (patch)
tree6d731fa9992bc09fe315353640180a19574ae723
parentb1b35eb9c5743cf179029bdbe763f258515273f4 (diff)
downloadbuildroot-0e749a6f30a7b102da65f6101f89fa1a2228833e.tar.gz
buildroot-0e749a6f30a7b102da65f6101f89fa1a2228833e.tar.bz2
boot/uboot: Set MAKE_ENV for kconfig build system
U-Boot fails to build in a GitLab CI context because the kconfig-package build stage is unable to find bison or flex even though they are installed in HOST_DIR. To fix this, set UBOOT_MAKE_ENV so that UBOOT_KCONFIG_MAKE uses the correct PATH. Signed-off-by: Thomas Preston <thomas.preston@codethink.co.uk> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--boot/uboot/uboot.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index bddafe2..a19cb72 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -449,6 +449,7 @@ endif # BR2_TARGET_UBOOT && BR_BUILDING
ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y)
$(eval $(generic-package))
else ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG),y)
+UBOOT_MAKE_ENV = $(TARGET_MAKE_ENV)
UBOOT_KCONFIG_DEPENDENCIES = \
$(BR2_BISON_HOST_DEPENDENCY) \
$(BR2_FLEX_HOST_DEPENDENCY)