diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-01-05 15:34:11 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-01-05 15:34:11 -0800 |
| commit | 4aea86b4033f92f01547e6d4388d4451ae9b0980 (patch) | |
| tree | 1e6e70b8133187b56d636ad9bb942c81b2654173 /tools/bpf | |
| parent | 0471005efac9ac70bffd50532f8de07a28eac5aa (diff) | |
| parent | 50011c32f421215f6231996fcc84fd1fe81c4a48 (diff) | |
| download | net-4aea86b4033f92f01547e6d4388d4451ae9b0980.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/bpf')
| -rw-r--r-- | tools/bpf/bpftool/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile index 313fd1b09189c4..ab20ecc5acce52 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile @@ -145,6 +145,10 @@ ifeq ($(feature-llvm),1) LLVM_CONFIG_LIB_COMPONENTS := mcdisassembler all-targets CFLAGS += $(shell $(LLVM_CONFIG) --cflags --libs $(LLVM_CONFIG_LIB_COMPONENTS)) LIBS += $(shell $(LLVM_CONFIG) --libs $(LLVM_CONFIG_LIB_COMPONENTS)) + ifeq ($(shell $(LLVM_CONFIG) --shared-mode),static) + LIBS += $(shell $(LLVM_CONFIG) --system-libs $(LLVM_CONFIG_LIB_COMPONENTS)) + LIBS += -lstdc++ + endif LDFLAGS += $(shell $(LLVM_CONFIG) --ldflags) else # Fall back on libbfd |