Bug 546389, nsssysinit binary built inside source tree, not objdir
authorkaie%kuix.de
Tue, 16 Feb 2010 19:38:42 +0000
changeset 9565 45798f81558af384623d9094b8fb45d675ffc690
parent 9564 0dfdbdc3f5bc98572c2595cdd0d08495b54134ee
child 9566 d0180c81887b85e2643634f3cbac0376b0c72264
push idunknown
push userunknown
push dateunknown
bugs546389
Bug 546389, nsssysinit binary built inside source tree, not objdir Patch v3, contributed by wtc@google.com, r=rrelyea
security/nss/lib/sysinit/config.mk
security/nss/lib/sysinit/manifest.mn
--- a/security/nss/lib/sysinit/config.mk
+++ b/security/nss/lib/sysinit/config.mk
@@ -105,17 +105,8 @@ endif
 ifeq ($(OS_ARCH), HP-UX) 
 ifneq ($(OS_TEST), ia64)
 # pa-risc
 ifeq ($(USE_64), 1)
 MKSHLIB += +b '$$ORIGIN'
 endif
 endif
 endif
-
-ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
-ifndef NS_USE_GCC
-# Export 'mktemp' to be backward compatible with NSS 3.2.x and 3.3.x
-# but do not put it in the import library.  See bug 142575.
-DEFINES += -DWIN32_NSS3_DLL_COMPAT
-DLLFLAGS += -EXPORT:mktemp=nss_mktemp,PRIVATE
-endif
-endif
--- a/security/nss/lib/sysinit/manifest.mn
+++ b/security/nss/lib/sysinit/manifest.mn
@@ -37,12 +37,11 @@
 
 CORE_DEPTH	= ../../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
 
 CSRCS = nsssysinit.c
 
-LIBRARY = nsssysinit
 LIBRARY_NAME = nsssysinit
 #LIBRARY_VERSION = 3