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: #7427 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Bert Belder <[email protected]>
nodejs · Jul 5, 2016 · a4880b5 · a4880b5
1 parent 5f766ad
commit a4880b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 45 deletions.
diff --git a/deps/openssl/masm_compile.gypi b/deps/openssl/masm_compile.gypi
diff --git 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)']
         }]