From 0230552c0d3d525a2d37ea5a0725ab47f6190f23 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Fri, 1 Sep 2000 09:29:20 +0000 Subject: [PATCH] Reorder libs for Irix linker & properly link in _s.a libs --- xpfe/bootstrap/Makefile.in | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/xpfe/bootstrap/Makefile.in b/xpfe/bootstrap/Makefile.in index 10a9c4b3d9a..f328a932497 100644 --- a/xpfe/bootstrap/Makefile.in +++ b/xpfe/bootstrap/Makefile.in @@ -35,21 +35,24 @@ PROGRAM = mozilla-bin endif EXTRA_DSO_LIBS = gkgfx +ifeq ($(MOZ_WIDGET_TOOLKIT),os2) +SHARED_LIBRARY_LIBS = -llibxpfelocation_s +else +SHARED_LIBRARY_LIBS = -lxpfelocation_s +endif + CPPSRCS = \ nsAppRunner.cpp \ nsSetupRegistry.cpp \ nsSigHandlers.cpp \ $(NULL) -XP_DIST_LIBS = \ +XP_LIBS = \ + $(EXTRA_DSO_LDOPTS) \ $(EXTRA_DSO_LIBS) \ $(XPCOM_LIBS) \ $(MOZ_JS_LIBS) \ $(OJI_LIBS) \ - $(NULL) - -XP_LIBS = \ - $(XP_DIST_LIBS) \ $(NSPR_LIBS) \ $(NULL) @@ -77,11 +80,7 @@ ifdef MOZ_OJI OJI_LIBS = -ljsj endif -ifeq ($(MOZ_WIDGET_TOOLKIT),os2) -LIBS = $(XP_LIBS) -llibxpfelocation_s -else -LIBS = $(XP_LIBS) -lxpfelocation_s -endif +LIBS = $(XP_LIBS) ifdef GC_LEAK_DETECTOR LIBS += -lboehm