Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit a4880b5

Browse filesBrowse files
indutnyFishrock123
indutny
authored and
Fishrock123
committed
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 <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Bert Belder <bertbelder@gmail.com>
1 parent 5f766ad commit a4880b5
Copy full SHA for a4880b5

File tree

Expand file treeCollapse file tree

2 files changed

+6
-45
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+6
-45
lines changed
Open diff view settings
Collapse file

‎deps/openssl/masm_compile.gypi‎

Copy file name to clipboardExpand all lines: deps/openssl/masm_compile.gypi
-44Lines changed: 0 additions & 44 deletions
This file was deleted.
Collapse file

‎deps/openssl/openssl.gyp‎

Copy file name to clipboardExpand all lines: deps/openssl/openssl.gyp
+6-1Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,12 @@
121121
}], # end of conditions of openssl_no_asm
122122
['OS=="win"', {
123123
'defines' : ['<@(openssl_defines_all_win)'],
124-
'includes': ['masm_compile.gypi',],
124+
'msvs_settings': {
125+
'MASM': {
126+
# Use /safeseh, see commit: 01fa5ee
127+
'UseSafeExceptionHandlers': 'true',
128+
},
129+
},
125130
}, {
126131
'defines' : ['<@(openssl_defines_all_non_win)']
127132
}]

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.