diff options
| author | Fedor Indutny <fedor@indutny.com> | 2016-07-16 00:04:07 -0400 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2016-07-17 01:04:37 -0400 |
| commit | d4debb990f5185c9c2757ae58712d7f5dc17cfa2 (patch) | |
| tree | dcdc65ddf1fae93f6c3d8219f11fae4c53d2978d /deps/openssl | |
| parent | 6510eb5ddc802dcd25713c2b3cbb82711c94d075 (diff) | |
| download | node-new-d4debb990f5185c9c2757ae58712d7f5dc17cfa2.tar.gz | |
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: https://github.com/nodejs/node/pull/7759
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Robert Jefe Lindstaedt <robert.lindstaedt@gmail.com>
Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
Diffstat (limited to 'deps/openssl')
| -rw-r--r-- | deps/openssl/openssl.gyp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index b25efe60d5..ae5c980e06 100644 --- a/deps/openssl/openssl.gyp +++ b/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': { |