Commit a4880b5
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 <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Bert Belder <bertbelder@gmail.com>1 parent 5f766ad commit a4880b5
2 files changed
Lines changed: 6 additions & 45 deletions
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -121,7 +121,12 @@ | |||
| 121 | 121 | }], # end of conditions of openssl_no_asm | |
| 122 | 122 | ['OS=="win"', { | |
| 123 | 123 | '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 | + }, | ||
| 125 | 130 | }, { | |
| 126 | 131 | 'defines' : ['<@(openssl_defines_all_non_win)'] | |
| 127 | 132 | }] | |
0 commit comments