Skip to content

Commit 1a4bf28

Browse files
committed
objtool: Avoid checking code drift on busybox's diff
That doesn't have -I to match lines. Cc: Adrian Hunter <[email protected]> Cc: David Ahern <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Wang Nan <[email protected]> Link: http://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 774bec3 commit 1a4bf28

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

tools/objtool/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,11 @@ include $(srctree)/tools/build/Makefile.include
4141
$(OBJTOOL_IN): fixdep FORCE
4242
@$(MAKE) $(build)=objtool
4343

44+
# Busybox's diff doesn't have -I, avoid warning in that case
45+
#
4446
$(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN)
45-
@(test -d ../../kernel -a -d ../../tools -a -d ../objtool && (( \
47+
@(diff -I 2>&1 | grep -q 'option requires an argument' && \
48+
test -d ../../kernel -a -d ../../tools -a -d ../objtool && (( \
4649
diff -I'^#include' arch/x86/insn/insn.c ../../arch/x86/lib/insn.c >/dev/null && \
4750
diff -I'^#include' arch/x86/insn/inat.c ../../arch/x86/lib/inat.c >/dev/null && \
4851
diff arch/x86/insn/x86-opcode-map.txt ../../arch/x86/lib/x86-opcode-map.txt >/dev/null && \

0 commit comments

Comments
 (0)