Commit 9ddc615
deps: no /safeseh for ml64.exe
`ml64.exe` doesn't support `/safeseh` option. Do not attempt to use it
if `target_arch=="x64"`.
See: https://msdn.microsoft.com/en-us/library/s0ksfwcf.aspx
PR-URL: #7759
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Robert Jefe Lindstaedt <robert.lindstaedt@gmail.com>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>1 parent ea36c61 commit 9ddc615
1 file changed
Lines changed: 5 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -121,15 +121,17 @@ | |||
| 121 | 121 | }], # end of conditions of openssl_no_asm | |
| 122 | 122 | ['OS=="win"', { | |
| 123 | 123 | 'defines' : ['<@(openssl_defines_all_win)'], | |
| 124 | + }, { | ||
| 125 | + 'defines' : ['<@(openssl_defines_all_non_win)'] | ||
| 126 | + }], | ||
| 127 | + ['target_arch=="ia32" and OS=="win"', { | ||
| 124 | 128 | 'msvs_settings': { | |
| 125 | 129 | 'MASM': { | |
| 126 | 130 | # Use /safeseh, see commit: 01fa5ee | |
| 127 | 131 | 'UseSafeExceptionHandlers': 'true', | |
| 128 | 132 | }, | |
| 129 | 133 | }, | |
| 130 | - }, { | ||
| 131 | - 'defines' : ['<@(openssl_defines_all_non_win)'] | ||
| 132 | - }] | ||
| 134 | + }], | ||
| 133 | 135 | ], | |
| 134 | 136 | 'include_dirs': ['<@(openssl_include_dirs)'], | |
| 135 | 137 | 'direct_dependent_settings': { | |
0 commit comments