From 14261bb71b7a81bd6c68003cce9d5cf68f49a2de Mon Sep 17 00:00:00 2001 From: Anon2026 Date: Fri, 23 Oct 2026 00:00:42 +0300 Subject: [PATCH] fix Makefile.linux logic, improve readability --- Makefile.linux | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/Makefile.linux b/Makefile.linux index 2c9d7996..f8ae5240 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -13,23 +13,14 @@ LDFLAGS ?= ${LD_DEBUG} CXXVER := $(shell $(CXX) -dumpversion) ifneq ($(findstring clang,$(CXX)),) NEEDED_CXXFLAGS += -std=c++20 -ifeq ($(TORRENTS),yes) - LDLIBS = -lboost_json -lboost_url -endif else ifeq ($(shell expr match ${CXXVER} "11"),2) # gcc 11 NEEDED_CXXFLAGS += -std=c++20 +# assume distro is too old, boost < 1.81 + TORRENTS := no else ifeq ($(shell expr match ${CXXVER} "12"),2) # gcc 12 NEEDED_CXXFLAGS += -std=c++20 -ifeq ($(TORRENTS),yes) -# assume boost >= 1.81 - LDLIBS = -lboost_json -lboost_url -endif else ifeq ($(shell expr match ${CXXVER} "1[3-9]"),2) # gcc 13+ NEEDED_CXXFLAGS += -std=c++23 -ifeq ($(TORRENTS),yes) -# assume boost >= 1.81 - LDLIBS = -lboost_json -lboost_url -endif else # not supported $(error Compiler too old) endif @@ -53,7 +44,11 @@ ifeq ($(USE_UPNP),yes) LDLIBS += $(LIBDIR)/libminiupnpc.a endif LDLIBS += -lpthread -ldl -else +else # USE_STATIC no +ifeq ($(TORRENTS),yes) +# assume boost >= 1.81 + LDLIBS = -lboost_json -lboost_url +endif LDLIBS += -lssl -lcrypto -lz -lboost_program_options -lpthread -latomic ifeq ($(USE_UPNP),yes) LDLIBS += -lminiupnpc