commit c77ae2b34ba28808c6ada78da752a5e3e1cd8aa5 Author: Georg Koppen gk@torproject.org Date: Mon Sep 1 13:29:52 2014 +0000

Bug 12811: Fix for Mozilla's bug 1058778.

This is the fix for https://bugzilla.mozilla.org/show_bug.cgi?id=1058778 which breaks cross-compilation with mingw-w64. --- security/build/moz.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/security/build/moz.build b/security/build/moz.build index 99fe8d6..e295613 100644 --- a/security/build/moz.build +++ b/security/build/moz.build @@ -5,10 +5,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/.

if CONFIG['MOZ_FOLD_LIBS']: + # Having thid if block here is needed to fix bug 1058778. + if CONFIG['OS_TARGET'] == 'WINNT': + DEFFILE = 'nss3.def' # TODO: The library name can be changed when bug 845217 is fixed. LIBRARY_NAME = 'nss3'

FORCE_SHARED_LIB = True - -if CONFIG['OS_TARGET'] == 'WINNT': - DEFFILE = 'nss3.def'