Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 0e1162c

Browse files
indutnyrvagg
authored andcommittedOct 18, 2016
deps: MASM.UseSafeExceptionHandlers for OpenSSL
Use `msvs_settings.MASM.UseSafeExceptionHandlers` when building OpenSSL assembly code on Windows. This option appends `/safeseh` to the list of assembler flags when building `.asm` files on Windows. Having this option in place, separate rules in `masm_compile.gypi` are no longer needed. Fix: #7426 PR-URL: #7427 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Bert Belder <[email protected]>
1 parent e3837e6 commit 0e1162c

File tree

2 files changed

+6
-45
lines changed

2 files changed

+6
-45
lines changed
 

‎deps/openssl/masm_compile.gypi

-44
This file was deleted.

‎deps/openssl/openssl.gyp

+6-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,12 @@
121121
}], # end of conditions of openssl_no_asm
122122
['OS=="win"', {
123123
'defines' : ['<@(openssl_defines_all_win)'],
124-
'includes': ['masm_compile.gypi',],
124+
'msvs_settings': {
125+
'MASM': {
126+
# Use /safeseh, see commit: 01fa5ee
127+
'UseSafeExceptionHandlers': 'true',
128+
},
129+
},
125130
}, {
126131
'defines' : ['<@(openssl_defines_all_non_win)']
127132
}]

0 commit comments

Comments
 (0)
Please sign in to comment.