Skip to content

Commit d70a6be

Browse files
iii-iborkmann
authored andcommitted
tools/bpf: Don't use $(COMPILE.c)
When using make kselftest TARGETS=bpf, tools/bpf is built with MAKEFLAGS=rR, which causes $(COMPILE.c) to be undefined, which in turn causes the build to fail with CC kselftest/bpf/tools/build/bpftool/map_perf_ring.o /bin/sh: 1: -MMD: not found Fix by using $(CC) $(CFLAGS) -c instead of $(COMPILE.c). Signed-off-by: Ilya Leoshkevich <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]> Link: https://lore.kernel.org/bpf/[email protected]
1 parent 9bc499b commit d70a6be

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

tools/bpf/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ $(OUTPUT)%.lex.c: $(srctree)/tools/bpf/%.l
6464
$(QUIET_FLEX)$(LEX) -o $@ $<
6565

6666
$(OUTPUT)%.o: $(srctree)/tools/bpf/%.c
67-
$(QUIET_CC)$(COMPILE.c) -o $@ $<
67+
$(QUIET_CC)$(CC) $(CFLAGS) -c -o $@ $<
6868

6969
$(OUTPUT)%.yacc.o: $(OUTPUT)%.yacc.c
70-
$(QUIET_CC)$(COMPILE.c) -o $@ $<
70+
$(QUIET_CC)$(CC) $(CFLAGS) -c -o $@ $<
7171
$(OUTPUT)%.lex.o: $(OUTPUT)%.lex.c
72-
$(QUIET_CC)$(COMPILE.c) -o $@ $<
72+
$(QUIET_CC)$(CC) $(CFLAGS) -c -o $@ $<
7373

7474
PROGS = $(OUTPUT)bpf_jit_disasm $(OUTPUT)bpf_dbg $(OUTPUT)bpf_asm
7575

tools/bpf/bpftool/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ else
126126
endif
127127

128128
$(OUTPUT)_prog.o: prog.c
129-
$(QUIET_CC)$(COMPILE.c) -MMD -DBPFTOOL_WITHOUT_SKELETONS -o $@ $<
129+
$(QUIET_CC)$(CC) $(CFLAGS) -c -MMD -DBPFTOOL_WITHOUT_SKELETONS -o $@ $<
130130

131131
$(OUTPUT)_bpftool: $(_OBJS) $(LIBBPF)
132132
$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(_OBJS) $(LIBS)
@@ -141,18 +141,18 @@ profiler.skel.h: $(OUTPUT)_bpftool skeleton/profiler.bpf.o
141141
$(QUIET_GEN)$(OUTPUT)./_bpftool gen skeleton skeleton/profiler.bpf.o > $@
142142

143143
$(OUTPUT)prog.o: prog.c profiler.skel.h
144-
$(QUIET_CC)$(COMPILE.c) -MMD -o $@ $<
144+
$(QUIET_CC)$(CC) $(CFLAGS) -c -MMD -o $@ $<
145145

146146
$(OUTPUT)disasm.o: $(srctree)/kernel/bpf/disasm.c
147-
$(QUIET_CC)$(COMPILE.c) -MMD -o $@ $<
147+
$(QUIET_CC)$(CC) $(CFLAGS) -c -MMD -o $@ $<
148148

149149
$(OUTPUT)feature.o: | zdep
150150

151151
$(OUTPUT)bpftool: $(__OBJS) $(LIBBPF)
152152
$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(__OBJS) $(LIBS)
153153

154154
$(OUTPUT)%.o: %.c
155-
$(QUIET_CC)$(COMPILE.c) -MMD -o $@ $<
155+
$(QUIET_CC)$(CC) $(CFLAGS) -c -MMD -o $@ $<
156156

157157
clean: $(LIBBPF)-clean
158158
$(call QUIET_CLEAN, bpftool)

0 commit comments

Comments
 (0)