Bug 370693, Mozilla.org nightly bits broken, Failure to use crypto with FIPS mode

Build system changes only
Patch originally proposed by Wan-Teh in bug 249782
r=bsmedberg


git-svn-id: svn://10.0.0.236/trunk@224643 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kaie%kuix.de
2007-04-17 20:42:54 +00:00
parent 7ba6cae87c
commit f552a4c7e4
2 changed files with 1 additions and 6 deletions

View File

@@ -162,14 +162,9 @@ ifdef MOZ_AIRBAG
endif
endif
## XXXvlad -- the test and cp should be removed once bug 249782 is
## completely fixed
signnss:
ifdef MOZILLA_OFFICIAL
echo signing NSS libs
ifdef MSMANIFEST_TOOL
test -f $(DEPTH)/nss/shlibsign.exe.manifest && cp $(DEPTH)/nss/shlibsign.exe.manifest $(DIST)/bin
endif
cd $(DIST)/bin; ./shlibsign.exe -v -i softokn3.dll
cd $(DIST)/bin; ./shlibsign.exe -v -i freebl3.dll
endif # MOZILLA_OFFICIAL

View File

@@ -178,7 +178,7 @@ NATIVE_ARCH = $(shell uname -p | sed -e s/powerpc/ppc/)
NATIVE_DIST = $(DIST)/../../$(NATIVE_ARCH)/dist
SIGN_CMD = $(NATIVE_DIST)/bin/run-mozilla.sh $(NATIVE_DIST)/bin/shlibsign -v -i
else
SIGN_CMD = $(DIST)/bin/run-mozilla.sh $(DEPTH)/nss/shlibsign -v -i
SIGN_CMD = $(RUN_TEST_PROGRAM) $(DIST)/bin/shlibsign -v -i
endif
SOFTOKN = $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH)/$(DLL_PREFIX)softokn3$(DLL_SUFFIX)