at 24.11-pre 28 lines 855 B view raw
1From 0cbe7f0adc86c92c61156c417b27b063f156b31b Mon Sep 17 00:00:00 2001 2From: Alyssa Ross <hi@alyssa.is> 3Date: Tue, 2 Jan 2024 18:15:20 +0100 4Subject: [PATCH] makefiles: fix disabling shared link 5 6LIB_SHARED still gets set when shared linking has been disabled, so 7the previous version of this check still attempted to build the 8shared library. 9--- 10 libdm/make.tmpl.in | 2 +- 11 1 file changed, 1 insertion(+), 1 deletion(-) 12 13diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in 14index 2dd9625d4d..69ba2c35ab 100644 15--- a/libdm/make.tmpl.in 16+++ b/libdm/make.tmpl.in 17@@ -436,7 +436,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64 18 @echo " [CC] $(<F)" 19 $(Q) $(CC) -c $(CFLAGS) $(CLDFLAGS) $< $(LIBS) -o $@ 20 21-ifneq (,$(LIB_SHARED)) 22+ifeq ("@SHARED_LINK@", "yes") 23 24 TARGETS += $(LIB_SHARED).$(LIB_VERSION) 25 $(LIB_SHARED).$(LIB_VERSION): $(OBJECTS) $(LDDEPS) 26-- 27GitLab 28