|
76 | 76 | ifneq ($(BPFTOOL_VERSION),)
|
77 | 77 | CFLAGS += -DBPFTOOL_VERSION='"$(BPFTOOL_VERSION)"'
|
78 | 78 | endif
|
79 |
| -@@ -119,11 +117,7 @@ |
| 79 | +@@ -123,11 +121,7 @@ |
80 | 80 | endif
|
81 | 81 |
|
82 | 82 | ifeq ($(check_feat),1)
|
|
89 | 89 | endif
|
90 | 90 |
|
91 | 91 | LIBS = $(LIBBPF) -lelf -lz
|
92 |
| -@@ -213,7 +207,7 @@ |
| 92 | +@@ -214,7 +208,7 @@ |
93 | 93 | $(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUTPUT)vmlinux.h $(LIBBPF_BOOTSTRAP)
|
94 | 94 | $(QUIET_CLANG)$(CLANG) \
|
95 | 95 | -I$(or $(OUTPUT),.) \
|
96 | 96 | - -I$(srctree)/tools/include/uapi/ \
|
97 | 97 | + -I$(srctree)/include/uapi/ \
|
98 | 98 | -I$(LIBBPF_BOOTSTRAP_INCLUDE) \
|
99 | 99 | -g -O2 -Wall -fno-stack-protector \
|
100 |
| - -target bpf -c $< -o $@ |
101 |
| -@@ -231,10 +225,10 @@ |
| 100 | + --target=bpf -c $< -o $@ |
| 101 | +@@ -232,7 +226,7 @@ |
102 | 102 |
|
103 | 103 | CFLAGS += $(if $(BUILD_BPF_SKELS),,-DBPFTOOL_WITHOUT_SKELETONS)
|
104 | 104 |
|
105 |
| --$(BOOTSTRAP_OUTPUT)disasm.o: $(srctree)/kernel/bpf/disasm.c |
106 |
| -+$(BOOTSTRAP_OUTPUT)disasm.o: $(srctree)/src/kernel/bpf/disasm.c |
107 |
| - $(QUIET_CC)$(HOSTCC) $(HOST_CFLAGS) -c -MMD $< -o $@ |
108 |
| - |
109 | 105 | -$(OUTPUT)disasm.o: $(srctree)/kernel/bpf/disasm.c
|
110 | 106 | +$(OUTPUT)disasm.o: $(srctree)/src/kernel/bpf/disasm.c
|
111 | 107 | $(QUIET_CC)$(CC) $(CFLAGS) -c -MMD $< -o $@
|
112 | 108 |
|
113 | 109 | $(BPFTOOL_BOOTSTRAP): $(BOOTSTRAP_OBJS) $(LIBBPF_BOOTSTRAP)
|
114 |
| -@@ -253,7 +247,7 @@ |
| 110 | +@@ -251,7 +245,7 @@ |
115 | 111 | $(call QUIET_CLEAN, feature-detect)
|
116 | 112 | $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
|
117 | 113 |
|
|
120 | 116 | $(call QUIET_CLEAN, bpftool)
|
121 | 117 | $(Q)$(RM) -- $(OUTPUT)bpftool $(OUTPUT)*.o $(OUTPUT)*.d
|
122 | 118 | $(Q)$(RM) -- $(OUTPUT)*.skel.h $(OUTPUT)vmlinux.h
|
123 |
| -@@ -269,7 +263,7 @@ |
| 119 | +@@ -267,7 +261,7 @@ |
124 | 120 |
|
125 | 121 | install: install-bin
|
126 | 122 | $(Q)$(INSTALL) -m 0755 -d $(DESTDIR)$(bash_compdir)
|
|
129 | 125 |
|
130 | 126 | uninstall:
|
131 | 127 | $(call QUIET_UNINST, bpftool)
|
132 |
| -@@ -277,16 +271,16 @@ |
| 128 | +@@ -275,16 +269,16 @@ |
133 | 129 | $(Q)$(RM) -- $(DESTDIR)$(bash_compdir)/bpftool
|
134 | 130 |
|
135 | 131 | doc:
|
|
0 commit comments