Skip to content

Commit

Permalink
deps: MASM.UseSafeExceptionHandlers for OpenSSL
Browse files Browse the repository at this point in the history
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 <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Bert Belder <bertbelder@gmail.com>
  • Loading branch information
indutny authored and MylesBorins committed Oct 26, 2016
1 parent f7796f2 commit ea36c61
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 45 deletions.
44 changes: 0 additions & 44 deletions deps/openssl/masm_compile.gypi

This file was deleted.

7 changes: 6 additions & 1 deletion deps/openssl/openssl.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,12 @@
}], # end of conditions of openssl_no_asm
['OS=="win"', {
'defines' : ['<@(openssl_defines_all_win)'],
'includes': ['masm_compile.gypi',],
'msvs_settings': {
'MASM': {
# Use /safeseh, see commit: 01fa5ee
'UseSafeExceptionHandlers': 'true',
},
},
}, {
'defines' : ['<@(openssl_defines_all_non_win)']
}]
Expand Down

0 comments on commit ea36c61

Please sign in to comment.