|
55 | 55 | - DESTDIR=$(LIBBPF_BOOTSTRAP_DESTDIR:/=) prefix= \ |
56 | 56 | + $(Q)$(MAKE) -C $(BPF_DIR) OBJDIR=$(patsubst %/,%,$(LIBBPF_BOOTSTRAP_OUTPUT)) \ |
57 | 57 | + DESTDIR="" PREFIX=$(LIBBPF_BOOTSTRAP_DESTDIR:/=) \ |
58 | | - ARCH= CROSS_COMPILE= CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)" $@ install_headers |
| 58 | + ARCH= CROSS_COMPILE= CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)" \ |
| 59 | + CFLAGS="$(LIBBPF_BOOTSTRAP_CFLAGS)" EXTRA_CFLAGS= $@ install_headers |
59 | 60 |
|
60 | | - $(LIBBPF_BOOTSTRAP_INTERNAL_HDRS): $(LIBBPF_BOOTSTRAP_HDRS_DIR)/%.h: $(BPF_DIR)/%.h | $(LIBBPF_BOOTSTRAP_HDRS_DIR) |
61 | | -@@ -75,9 +73,9 @@ |
| 61 | +@@ -76,9 +74,9 @@ |
62 | 62 | CFLAGS += -DPACKAGE='"bpftool"' -D__EXPORTED_HEADERS__ \ |
63 | 63 | -I$(or $(OUTPUT),.) \ |
64 | 64 | -I$(LIBBPF_INCLUDE) \ |
|
71 | 71 | ifneq ($(BPFTOOL_VERSION),) |
72 | 72 | CFLAGS += -DBPFTOOL_VERSION='"$(BPFTOOL_VERSION)"' |
73 | 73 | endif |
74 | | -@@ -123,11 +121,7 @@ |
| 74 | +@@ -146,11 +144,7 @@ |
75 | 75 | endif |
76 | 76 |
|
77 | 77 | ifeq ($(check_feat),1) |
|
83 | 83 | +include Makefile.feature |
84 | 84 | endif |
85 | 85 |
|
86 | | - LIBS = $(LIBBPF) -lelf -lz |
87 | | -@@ -225,7 +219,7 @@ |
88 | | - $(OUTPUT)%.bpf.o: skeleton/%.bpf.c $(OUTPUT)vmlinux.h $(LIBBPF_BOOTSTRAP) |
89 | | - $(QUIET_CLANG)$(CLANG) \ |
| 86 | + LIBS = $(LIBBPF) -lelf $(CRYPTO_LIBS) -lz |
| 87 | +@@ -263,7 +257,7 @@ |
| 88 | + -Wno-microsoft-anon-tag \ |
| 89 | + -fms-extensions \ |
90 | 90 | -I$(or $(OUTPUT),.) \ |
91 | 91 | - -I$(srctree)/tools/include/uapi/ \ |
92 | 92 | + -I$(srctree)/include/uapi/ \ |
93 | 93 | -I$(LIBBPF_BOOTSTRAP_INCLUDE) \ |
94 | 94 | -g -O2 -Wall -fno-stack-protector \ |
95 | 95 | --target=bpf -c $< -o $@ |
96 | | -@@ -243,7 +237,7 @@ |
| 96 | +@@ -281,7 +275,7 @@ |
97 | 97 |
|
98 | 98 | CFLAGS += $(if $(BUILD_BPF_SKELS),,-DBPFTOOL_WITHOUT_SKELETONS) |
99 | 99 |
|
|
102 | 102 | $(QUIET_CC)$(CC) $(CFLAGS) -c -MMD $< -o $@ |
103 | 103 |
|
104 | 104 | $(BPFTOOL_BOOTSTRAP): $(BOOTSTRAP_OBJS) $(LIBBPF_BOOTSTRAP) |
105 | | -@@ -262,7 +256,7 @@ |
| 105 | +@@ -300,7 +294,7 @@ |
106 | 106 | $(call QUIET_CLEAN, feature-detect) |
107 | 107 | $(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null |
108 | 108 |
|
|
111 | 111 | $(call QUIET_CLEAN, bpftool) |
112 | 112 | $(Q)$(RM) -- $(OUTPUT)bpftool $(OUTPUT)*.o $(OUTPUT)*.d |
113 | 113 | $(Q)$(RM) -- $(OUTPUT)*.skel.h $(OUTPUT)vmlinux.h |
114 | | -@@ -278,7 +272,7 @@ |
| 114 | +@@ -316,7 +310,7 @@ |
115 | 115 |
|
116 | 116 | install: install-bin |
117 | 117 | $(Q)$(INSTALL) -m 0755 -d $(DESTDIR)$(bash_compdir) |
|
120 | 120 |
|
121 | 121 | uninstall: |
122 | 122 | $(call QUIET_UNINST, bpftool) |
123 | | -@@ -286,16 +280,16 @@ |
| 123 | +@@ -324,16 +318,16 @@ |
124 | 124 | $(Q)$(RM) -- $(DESTDIR)$(bash_compdir)/bpftool |
125 | 125 |
|
126 | 126 | doc: |
|
0 commit comments