From 1efbef61439741d6473c509cfb4946ebb089c1c0 Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Fri, 14 Oct 2022 22:53:29 -0700 Subject: [PATCH] ANDROID: kbuild: Use '-f' instead of '--file=' for grep The toybox grep doesn't support the longer '--file=FILE' command line argument which was introduced in commit ce697ccee1a8 ("kbuild: remove head-y syntax"). So update Makefile to use '-f FILE' to fix the compiling error: grep: Unknown option 'file=.../common/scripts/head-object-list.txt' (see "grep --help") Bug: 253726452 Signed-off-by: Will McVicker Change-Id: Ie42b9edfafc04c37f657dc07f04af39d20aa8248 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8e42be0655cc..320d8efc24fb 100644 --- a/Makefile +++ b/Makefile @@ -1277,7 +1277,7 @@ quiet_cmd_ar_vmlinux.a = AR $@ cmd_ar_vmlinux.a = \ rm -f $@; \ $(AR) cDPrST $@ $(KBUILD_VMLINUX_OBJS); \ - $(AR) mPiT $$($(AR) t $@ | head -n1) $@ $$($(AR) t $@ | grep -F --file=$(srctree)/scripts/head-object-list.txt) + $(AR) mPiT $$($(AR) t $@ | head -n1) $@ $$($(AR) t $@ | grep -F -f $(srctree)/scripts/head-object-list.txt) targets += vmlinux.a vmlinux.a: $(KBUILD_VMLINUX_OBJS) scripts/head-object-list.txt autoksyms_recursive FORCE