diff --git a/mozilla/xpcom/tools/registry/Makefile.in b/mozilla/xpcom/tools/registry/Makefile.in
index 5386ee7ceb4..f21fe579a05 100644
--- a/mozilla/xpcom/tools/registry/Makefile.in
+++ b/mozilla/xpcom/tools/registry/Makefile.in
@@ -26,10 +26,15 @@ CPPSRCS		= regExport.cpp regxpcom.cpp
 
 SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
 
-LIBS		+= \
+ifdef NO_LD_ARCHIVE_FLAGS
+LOST_SYM_LIBS	= -lxpcomds_s -lxptinfo -lmozreg_s
+endif
+
+LIBS		= \
 		-lxpcom \
 		-lmozjs \
 		$(TK_LIBS) \
+		$(LOST_SYM_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)