diff --git a/xpcom/tools/registry/Makefile.in b/xpcom/tools/registry/Makefile.in
index 6cc2f5289aab..0e555dbb948b 100644
--- a/xpcom/tools/registry/Makefile.in
+++ b/xpcom/tools/registry/Makefile.in
@@ -13,6 +13,7 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -21,16 +22,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		=
-
 CPPSRCS		= regExport.cpp
 
-include $(topsrcdir)/config/config.mk
+SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
 
-DEFINES		+= -DUSE_NSREG
+ifdef NO_LD_ARCHIVE_FLAGS
+LOST_SYM_LIBS	= -lxpcomds_s -lxptinfo
+endif
 
-LIBS		= -lxpcom $(NSPR_LIBS) $(ZLIB_LIBS)
-
-SIMPLE_PROGRAMS	= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
+LIBS		= -lxpcom $(LOST_SYM_LIBS) $(NSPR_LIBS) $(ZLIB_LIBS)
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -DUSE_NSREG