Windows: do not search for signtool.exe
Permit an explicit version of signtool.exe to be specified via an environment variable. Now that sha256 signatures are required the version of signtool.exe that matches the SDK or Visual Studio version might not be sufficient to apply code signatures. Change-Id: I694e2b319bd692d6358ae7ce3d241da2da7648f8
This commit is contained in:
@@ -123,7 +123,6 @@ LEX_CMD=flex.exe
|
||||
PYTHON=python.exe
|
||||
PERL=perl.exe
|
||||
CMP=cmp.exe
|
||||
SIGNTOOL=signtool.exe
|
||||
MAKECAT=makecat.exe
|
||||
HHC=hhc.exe
|
||||
MAKEINFO=makeinfo.exe
|
||||
@@ -247,7 +246,7 @@ RC2RES = $(RC2RES_C) -fo $@ $**
|
||||
|
||||
REQUIRED_TOOLS= \
|
||||
"$(AWK_CMD)" "$(YACC_CMD)" "$(LEX_CMD)" "$(PYTHON)" "$(PERL)" \
|
||||
"$(CMP)" "$(SED)" "$(SIGNTOOL)" "$(MAKECAT)" "$(MAKEINFO)" "$(HHC)"
|
||||
"$(CMP)" "$(SED)" "$(MAKECAT)" "$(MAKEINFO)" "$(HHC)"
|
||||
|
||||
!ifdef BUILD_INSTALLERS
|
||||
REQUIRED_TOOLS=$(REQUIRED_TOOLS) "$(CANDLE_CMD)" "$(LIGHT_CMD)"
|
||||
@@ -488,6 +487,10 @@ _VC_MANIFEST_CLEAN= \
|
||||
#----------------------------------------------------------------------
|
||||
# Code and assembly signing
|
||||
#
|
||||
#
|
||||
# SIGNTOOL is fullpath to signtool.exe from Windows v8.1 or later SDK
|
||||
# (earlier versions do not support SHA-2 signatures)
|
||||
#
|
||||
# SIGNTOOL_C is any set of options required for certificate/private
|
||||
# key selection for code signging.
|
||||
#
|
||||
@@ -499,6 +502,10 @@ _VC_MANIFEST_CLEAN= \
|
||||
_CODESIGN=( $(CODESIGN) $@ )
|
||||
!else
|
||||
|
||||
!ifndef SIGNTOOL
|
||||
SIGNTOOL=signtool.exe
|
||||
!endif
|
||||
|
||||
!ifdef SIGNTOOL_C
|
||||
|
||||
!ifndef SIGNTOOL_T
|
||||
|
Reference in New Issue
Block a user