diff --git a/configure/CONFIG_ADDONS b/configure/CONFIG_ADDONS
index 03a6ceea1..bad9ba715 100644
--- a/configure/CONFIG_ADDONS
+++ b/configure/CONFIG_ADDONS
@@ -152,6 +152,14 @@ OBJS_HOST+=$(OBJS_HOST_DEFAULT)
 endif
 endif
 
+ifneq ($(strip $(LIBOBJS_$(OS_CLASS))),)
+LIBOBJS+=$(subst -nil-,,$(LIBOBJS_$(OS_CLASS)))
+else
+ifneq (,$(strip $(LIBOBJS_DEFAULT)))
+LIBOBJS+=$(LIBOBJS_DEFAULT)
+endif
+endif
+
 ifneq ($(strip $(LIBRARY_$(OS_CLASS))),)
 LIBRARY+=$(subst -nil-,,$(LIBRARY_$(OS_CLASS)))
 else