From 31fda2d059fbdaaef3f0c09dbb2a3a5e9b48e738 Mon Sep 17 00:00:00 2001 From: "julien.pierre.bugs%sun.com" Date: Fri, 26 Aug 2005 02:17:05 +0000 Subject: [PATCH] Fix for 297802 . r=wtchang . Add $(OS_LIBS) to MKSHLIB rules. Add -z defs linker option for Solaris and Linux . Also add -z ignore on Solaris . git-svn-id: svn://10.0.0.236/trunk@179021 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/coreconf/Linux.mk | 2 +- mozilla/security/coreconf/SunOS5.mk | 1 + mozilla/security/coreconf/rules.mk | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mozilla/security/coreconf/Linux.mk b/mozilla/security/coreconf/Linux.mk index 75fe4d60399..ca0804bfeb2 100644 --- a/mozilla/security/coreconf/Linux.mk +++ b/mozilla/security/coreconf/Linux.mk @@ -165,7 +165,7 @@ endif ARCH = linux DSO_CFLAGS = -fPIC -DSO_LDOPTS = -shared $(ARCHFLAG) +DSO_LDOPTS = -shared $(ARCHFLAG) -z defs DSO_LDFLAGS = LDFLAGS += $(ARCHFLAG) diff --git a/mozilla/security/coreconf/SunOS5.mk b/mozilla/security/coreconf/SunOS5.mk index 858e0d97d63..2bc5d72173f 100644 --- a/mozilla/security/coreconf/SunOS5.mk +++ b/mozilla/security/coreconf/SunOS5.mk @@ -191,6 +191,7 @@ ifdef NS_USE_GCC else DSO_CFLAGS += -KPIC endif +DSO_LDOPTS += -z combreloc -z defs -z ignore NOSUCHFILE = /solaris-rm-f-sucks diff --git a/mozilla/security/coreconf/rules.mk b/mozilla/security/coreconf/rules.mk index 631279e4039..e454fc7fed9 100644 --- a/mozilla/security/coreconf/rules.mk +++ b/mozilla/security/coreconf/rules.mk @@ -348,9 +348,9 @@ else endif else ifdef XP_OS2_VACPP - $(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) + $(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) else - $(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) + $(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) endif chmod +x $@ ifeq ($(OS_TARGET),Darwin)