Permalink
Browse files

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>
  • Loading branch information...
indutny committed Jul 16, 2016
1 parent 6510eb5 commit d4debb990f5185c9c2757ae58712d7f5dc17cfa2
Showing with 5 additions and 3 deletions.
  1. +5 −3 deps/openssl/openssl.gyp
@@ -121,15 +121,17 @@
}], # end of conditions of openssl_no_asm
['OS=="win"', {
'defines' : ['<@(openssl_defines_all_win)'],
}, {
'defines' : ['<@(openssl_defines_all_non_win)']
}],
['target_arch=="ia32" and OS=="win"', {
'msvs_settings': {
'MASM': {
# Use /safeseh, see commit: 01fa5ee
'UseSafeExceptionHandlers': 'true',
},
},
}, {
'defines' : ['<@(openssl_defines_all_non_win)']
}]
}],
],
'include_dirs': ['<@(openssl_include_dirs)'],
'direct_dependent_settings': {

0 comments on commit d4debb9

Please sign in to comment.