mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 09:12:07 +00:00
perf build: Minor improvement for linking libzstd
The zstd library will be automatically linked by detecting the feature libzstd. It is no need to explicitly link it for static builds, so remove the redundant linkage. It is contradictory to detect the feature libelf-zstd while the build configuration NO_LIBZSTD is set. Report an error for reminding users not to set NO_LIBZSTD. Signed-off-by: Leo Yan <leo.yan@arm.com> Tested-by: Namhyung Kim <namhyung@kernel.org> Acked-by: Andrii Nakryiko <andrii@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Eduard Zingerman <eddyz87@gmail.com> Cc: Guilherme Amadio <amadio@gentoo.org> Cc: Hao Luo <haoluo@google.com> Cc: Ian Rogers <irogers@google.com> Cc: James Clark <james.clark@linaro.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: John Fastabend <john.fastabend@gmail.com> Cc: KP Singh <kpsingh@kernel.org> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Martin KaFai Lau <martin.lau@linux.dev> Cc: Nick Terrell <terrelln@fb.com> Cc: Quentin Monnet <qmo@kernel.org> Cc: Song Liu <song@kernel.org> Cc: Stanislav Fomichev <sdf@google.com> Cc: Yonghong Song <yonghong.song@linux.dev> Link: https://lore.kernel.org/r/20241215221223.293205-3-leo.yan@arm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
d557814cdf
commit
44b44ffd5d
@ -171,7 +171,7 @@ ifdef LIBDW_DIR
|
||||
endif
|
||||
DWARFLIBS := -ldw
|
||||
ifeq ($(findstring -static,${LDFLAGS}),-static)
|
||||
DWARFLIBS += -lelf -lz -llzma -lbz2 -lzstd
|
||||
DWARFLIBS += -lelf -lz -llzma -lbz2
|
||||
|
||||
LIBDW_VERSION := $(shell $(PKG_CONFIG) --modversion libdw).0.0
|
||||
LIBDW_VERSION_1 := $(word 1, $(subst ., ,$(LIBDW_VERSION)))
|
||||
@ -566,6 +566,12 @@ ifndef NO_LIBELF
|
||||
CFLAGS += -DHAVE_ELF_GETSHDRSTRNDX_SUPPORT
|
||||
endif
|
||||
|
||||
ifeq ($(feature-libelf-zstd), 1)
|
||||
ifdef NO_LIBZSTD
|
||||
$(error Error: libzstd is required by libelf, please do not set NO_LIBZSTD)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifndef NO_LIBDEBUGINFOD
|
||||
$(call feature_check,libdebuginfod)
|
||||
ifeq ($(feature-libdebuginfod), 1)
|
||||
|
Loading…
Reference in New Issue
Block a user