From fc174b7057495ebb31393ae27f3ceeefdc490022 Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Sat, 21 May 2016 13:11:09 -0700 Subject: [PATCH] grub2: fix build with BR2_STRIP_none grub2 assumes the strip command will generate output and the output should always be stripped - so, just use the $(TARGET_CROSS)strip to make sure that the build succeeds regardless of the buildroot strip configuration. Signed-off-by: Charles Hardin Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- boot/grub2/grub2.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk index 112a401b02..dc4e51ea8e 100644 --- a/boot/grub2/grub2.mk +++ b/boot/grub2/grub2.mk @@ -45,6 +45,9 @@ endif # the confusion, it also uses NM, OBJCOPY and STRIP to build the # bootloader itself; none of these are used to build the native # tools. +# +# NOTE: TARGET_STRIP is overridden by BR2_STRIP_none, so always +# use the cross compile variant to ensure grub2 builds GRUB2_CONF_ENV = \ $(HOST_CONFIGURE_OPTS) \ @@ -55,7 +58,7 @@ GRUB2_CONF_ENV = \ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ NM="$(TARGET_NM)" \ OBJCOPY="$(TARGET_OBJCOPY)" \ - STRIP="$(TARGET_STRIP)" + STRIP="$(TARGET_CROSS)strip" GRUB2_CONF_OPTS = \ --target=$(GRUB2_TARGET) \ -- 2.30.2