Skip to content

Commit 939cf6d

Browse files
indutnyevanlucas
authored andcommitted
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: #7759 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Robert Jefe Lindstaedt <[email protected]> Reviewed-By: Minwoo Jung <[email protected]>
1 parent 3ed0204 commit 939cf6d

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

deps/openssl/openssl.gyp

+5-3
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,17 @@
121121
}], # end of conditions of openssl_no_asm
122122
['OS=="win"', {
123123
'defines' : ['<@(openssl_defines_all_win)'],
124+
}, {
125+
'defines' : ['<@(openssl_defines_all_non_win)']
126+
}],
127+
['target_arch=="ia32" and OS=="win"', {
124128
'msvs_settings': {
125129
'MASM': {
126130
# Use /safeseh, see commit: 01fa5ee
127131
'UseSafeExceptionHandlers': 'true',
128132
},
129133
},
130-
}, {
131-
'defines' : ['<@(openssl_defines_all_non_win)']
132-
}]
134+
}],
133135
],
134136
'include_dirs': ['<@(openssl_include_dirs)'],
135137
'direct_dependent_settings': {

0 commit comments

Comments
 (0)