Fix for platforms with no --whole-archive flags.

intl/unicharutil/tests/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,18 +22,21 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CPPSRCS		= UnicharSelfTest.cpp 
-
-include $(topsrcdir)/config/config.mk
-
-#DEFINES		+= -DUSE_NSREG
-INCLUDES	+= -I$(srcdir)/../public -I$(DIST)/include
-
-LIBS	= \
-	-lxpcom \
-	$(NSPR_LIBS) \
-	$(NULL)
-
 PROGRAM		= UnicharSelfTest
 
+CPPSRCS		= UnicharSelfTest.cpp 
+
+ifdef NO_LD_ARCHIVE_FLAGS
+LOST_SYM_LIBS	= -lxpcomds_s -lxptinfo
+endif
+
 include $(topsrcdir)/config/rules.mk
+
+LIBS		+= \
+		-lxpcom \
+		$(LOST_SYM_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
+
+INCLUDES	+= -I$(srcdir)/../public -I$(DIST)/include
+