mirror of https://github.com/lukechilds/node.git
Browse Source
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>v7.x
2 changed files with 6 additions and 45 deletions
@ -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.', |
|
||||
} |
|
||||
], |
|
||||
}], |
|
||||
], |
|
||||
} |
|
Loading…
Reference in new issue