diff --git a/make/defs.mk b/make/defs.mk
index d3b55884..df1a924a 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -979,11 +979,14 @@ endif
 
 INCLUDE                   += $(call proj_query, cflags  $(PREREQ_BUILD) $(PROJECT))
 
-LDFLAGS_QUERY_ARGS         = $(addprefix --exclude ,$(LDFLAGS_EXCLUDE)) $(PREREQ_BUILD) $(PROJECT)
+LDFLAGS_QUERY_ARGS         = $(addprefix --exclude ,$(LDFLAGS_EXCLUDE))
+LIBFLAGS                  += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS) --add-self $(PREREQ_BUILD))
+
+# the following is necessary, because not all projects have build.libname = none in project.conf
 ifeq ($(USE_PROJECT_LIB),true)
-  LDFLAGS_QUERY_ARGS      += --add-self
+  LDFLAGS_QUERY_ARGS_SELF  = --add-self
 endif
-LIBFLAGS                  += $(call proj_query, ldflags $(LDFLAGS_QUERY_ARGS))
+LIBFLAGS                  += $(call proj_query, ldflags  $(LDFLAGS_QUERY_ARGS) $(LDFLAGS_QUERY_ARGS_SELF) $(PROJECT))
 
 #include $(MODDIR)/make/lib-deps.mk