at 23.11-beta 48 lines 1.4 kB view raw
1diff --git a/Makefile b/Makefile 2index d7596a1a..dd7b97b6 100644 3--- a/Makefile 4+++ b/Makefile 5@@ -50,6 +50,7 @@ CMD_STATICCHECK ?= staticcheck 6 # libs 7 # 8 9+LIB_BPF ?= libbpf 10 LIB_ELF ?= libelf 11 LIB_ZLIB ?= zlib 12 13@@ -279,8 +280,6 @@ OUTPUT_DIR = ./dist 14 $(OUTPUT_DIR): 15 # 16 @$(CMD_MKDIR) -p $@ 17- @$(CMD_MKDIR) -p $@/libbpf 18- @$(CMD_MKDIR) -p $@/libbpf/obj 19 20 # 21 # embedded btfhub 22@@ -418,7 +417,6 @@ TRACEE_EBPF_OBJ_CORE_HEADERS = $(shell find pkg/ebpf/c -name *.h) 23 bpf-core: $(OUTPUT_DIR)/tracee.bpf.core.o 24 25 $(OUTPUT_DIR)/tracee.bpf.core.o: \ 26- $(OUTPUT_DIR)/libbpf/libbpf.a \ 27 $(TRACEE_EBPF_OBJ_SRC) \ 28 $(TRACEE_EBPF_OBJ_CORE_HEADERS) 29 # 30@@ -453,8 +451,8 @@ ifeq ($(STATIC), 1) 31 GO_TAGS_EBPF := $(GO_TAGS_EBPF),netgo 32 endif 33 34-CUSTOM_CGO_CFLAGS = "-I$(abspath $(OUTPUT_DIR)/libbpf)" 35-CUSTOM_CGO_LDFLAGS = "$(shell $(call pkg_config, $(LIB_ELF))) $(shell $(call pkg_config, $(LIB_ZLIB))) $(abspath $(OUTPUT_DIR)/libbpf/libbpf.a)" 36+CUSTOM_CGO_CFLAGS = "" 37+CUSTOM_CGO_LDFLAGS = "$(shell $(call pkg_config, $(LIB_BPF))) $(shell $(call pkg_config, $(LIB_ELF))) $(shell $(call pkg_config, $(LIB_ZLIB)))" 38 39 GO_ENV_EBPF = 40 GO_ENV_EBPF += GOOS=linux 41@@ -474,6 +472,7 @@ $(OUTPUT_DIR)/tracee-ebpf: \ 42 $(TRACEE_EBPF_SRC) \ 43 ./embedded-ebpf.go \ 44 | .checkver_$(CMD_GO) \ 45+ .checklib_$(LIB_BPF) \ 46 .checklib_$(LIB_ELF) \ 47 .checklib_$(LIB_ZLIB) \ 48 btfhub