summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcvs2hg <devnull@localhost>2006-01-12 23:08:48 +0000
committercvs2hg <devnull@localhost>2006-01-12 23:08:48 +0000
commitde9755d3d7485259c2bc69936ff6dee987d8dc6a (patch)
tree96de70f16988b489d189f7a849d0496d89f0eb9e
parent55bb4a89cb6bfbef67c6502b3fa95252a66229b9 (diff)
downloadnss-hg-NSS_3_11_RTM_SUN.tar.gz
fixup commit for tag 'NSS_3_11_RTM_SUN'NSS_3_11_RTM_SUN
-rw-r--r--security/coreconf/Linux.mk2
-rw-r--r--security/coreconf/Linux2.6.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/security/coreconf/Linux.mk b/security/coreconf/Linux.mk
index 3a7b25fe8..d87c4ce82 100644
--- a/security/coreconf/Linux.mk
+++ b/security/coreconf/Linux.mk
@@ -165,7 +165,7 @@ endif
ARCH = linux
DSO_CFLAGS = -fPIC
-DSO_LDOPTS = -shared $(ARCHFLAG) -z defs
+DSO_LDOPTS = -shared $(ARCHFLAG)
DSO_LDFLAGS =
LDFLAGS += $(ARCHFLAG)
diff --git a/security/coreconf/Linux2.6.mk b/security/coreconf/Linux2.6.mk
index 86bffef75..7d873de40 100644
--- a/security/coreconf/Linux2.6.mk
+++ b/security/coreconf/Linux2.6.mk
@@ -37,6 +37,8 @@
include $(CORE_DEPTH)/coreconf/Linux.mk
+DSO_LDOPTS += -z defs
+
OS_REL_CFLAGS += -DLINUX2_1
MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)