diff options
| author | Fedor Indutny <fedor@indutny.com> | 2016-06-26 03:54:12 -0400 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2016-06-27 14:11:23 -0400 |
| commit | 2787d7069490910e6419d44074933ac45134449a (patch) | |
| tree | b94b687be0868206d7ccb703ecc9ef7292efd22c /deps | |
| parent | 9744928cf5fae9b2a5a5c88f7aeeeb3a01220afe (diff) | |
| download | android-node-v8-2787d7069490910e6419d44074933ac45134449a.tar.gz android-node-v8-2787d7069490910e6419d44074933ac45134449a.tar.bz2 android-node-v8-2787d7069490910e6419d44074933ac45134449a.zip | |
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: https://github.com/nodejs/node/pull/7427
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Bert Belder <bertbelder@gmail.com>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/openssl/masm_compile.gypi | 44 | ||||
| -rw-r--r-- | deps/openssl/openssl.gyp | 7 |
2 files changed, 6 insertions, 45 deletions
diff --git a/deps/openssl/masm_compile.gypi b/deps/openssl/masm_compile.gypi deleted file mode 100644 index c18e484f73..0000000000 --- a/deps/openssl/masm_compile.gypi +++ /dev/null @@ -1,44 +0,0 @@ -{ - 'conditions': [ - ['target_arch=="ia32"', { - 'rules': [ - { - 'rule_name': 'Assemble', - 'extension': 'asm', - 'inputs': [], - 'outputs': [ - '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', - ], - 'action': [ - 'ml.exe', - '/Zi', - '/safeseh', - '/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', - '/c', '<(RULE_INPUT_PATH)', - ], - 'process_outputs_as_sources': 0, - 'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.', - } - ], - }, 'target_arch=="x64"', { - 'rules': [ - { - 'rule_name': 'Assemble', - 'extension': 'asm', - 'inputs': [], - 'outputs': [ - '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', - ], - 'action': [ - 'ml64.exe', - '/Zi', - '/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', - '/c', '<(RULE_INPUT_PATH)', - ], - 'process_outputs_as_sources': 0, - 'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.', - } - ], - }], - ], -} diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index db57033d54..b25efe60d5 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -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)'] }] |