fixup commit for tag 'NSS_3_5_BETA2' NSS_3_5_BRANCH NSS_3_5_BETA2
authorcvs2hg
Tue, 18 Jun 2002 20:37:39 +0000
branchNSS_3_5_BRANCH
changeset 3238 947c549ceaca6d9593897bb30ab990c11f61636a
parent 3237 2122e430ed4d8bdcd3cb915c80f5d2b8ba11b9ce
child 3271 0ec8cc429794218414f6876b4389c66fb3cff803
push idunknown
push userunknown
push dateunknown
fixup commit for tag 'NSS_3_5_BETA2'
security/coreconf/Darwin.mk
security/coreconf/rules.mk
--- a/security/coreconf/Darwin.mk
+++ b/security/coreconf/Darwin.mk
@@ -65,12 +65,10 @@ endif
 
 ARCH		= darwin
 
 # May override this with -bundle to create a loadable module.
 DSO_LDOPTS	= -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@)
 
 MKSHLIB		= $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS)
 DLL_SUFFIX	= dylib
-PROCESS_MAP_FILE = grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \
-                sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@
 
 G++INCLUDES	= -I/usr/include/g++
--- a/security/coreconf/rules.mk
+++ b/security/coreconf/rules.mk
@@ -359,21 +359,16 @@ ifdef XP_OS2_VACPP
 	$(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $@.def
 else
 	$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
 endif
 	chmod +x $@
 ifeq ($(OS_TARGET),OpenVMS)
 	@echo "`translate $@`" > $(@:$(DLL_SUFFIX)=vms)
 endif
-ifeq ($(OS_TARGET),Darwin)
-ifdef MAPFILE
-	nmedit -s $(MAPFILE) $@
-endif
-endif
 endif
 endif
 
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 $(RES): $(RESNAME)
 	@$(MAKE_OBJDIR)
 # The resource compiler does not understand the -U option.
 	$(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $<