bug 1075723: use different signing format for 64-bit windows builds. r=catlee
authorBen Hearsum <bhearsum@mozilla.com>
Fri, 03 Oct 2014 12:03:23 -0400
changeset 231975 9ce49a02b32fca0810c5a9043cdaf08de39f51f8
parent 231974 5fe91075c467977988afb41f5b4d2cf511b6a6e3
child 231976 086b51f4ba0b61befd338d38aae0ad5de0504848
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 17:57:20 +0000
reviewerscatlee
bugs1075723
milestone35.0a1
bug 1075723: use different signing format for 64-bit windows builds. r=catlee
toolkit/mozapps/installer/signing.mk
--- a/toolkit/mozapps/installer/signing.mk
+++ b/toolkit/mozapps/installer/signing.mk
@@ -3,18 +3,23 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # We shouldn't sign the first pass of a PGO build
 ifndef MOZ_PROFILE_GENERATE
 
 # Signing support
 ifdef MOZ_SIGN_CMD
 ifeq (WINNT,$(OS_ARCH))
+ifeq (x86_64,$(TARGET_CPU))
+MOZ_INTERNAL_SIGNING_FORMAT := osslsigncode
+MOZ_EXTERNAL_SIGNING_FORMAT := osslsigncode
+else
 MOZ_INTERNAL_SIGNING_FORMAT := signcode
 MOZ_EXTERNAL_SIGNING_FORMAT := signcode
+endif
 SIGN_INCLUDES := \
   '*.dll' \
   '*.exe' \
   $(NULL)
 
 SIGN_EXCLUDES := \
   'D3DCompiler*.dll' \
   'msvc*.dll' \