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 699dd7e

Browse filesBrowse files
authored
Merge pull request #28725 from QuLogic/enable-fh4
Stop disabling FH4 Exception Handling on MSVC
2 parents 6ff7f40 + 57d41fe commit 699dd7e
Copy full SHA for 699dd7e

File tree

Expand file treeCollapse file tree

1 file changed

+1
-10
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+1
-10
lines changed

‎src/meson.build

Copy file name to clipboardExpand all lines: src/meson.build
+1-10Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,21 +160,12 @@ extension_data = {
160160
},
161161
}
162162

163-
cpp_special_arguments = []
164-
if cpp.get_id() == 'msvc' and get_option('buildtype') != 'plain'
165-
# Disable FH4 Exception Handling implementation so that we don't require
166-
# VCRUNTIME140_1.dll. For more details, see:
167-
# https://devblogs.microsoft.com/cppblog/making-cpp-exception-handling-smaller-x64/
168-
# https://github.com/joerick/cibuildwheel/issues/423#issuecomment-677763904
169-
cpp_special_arguments += ['/d2FH4-']
170-
endif
171-
172163
foreach ext, kwargs : extension_data
173164
# Ensure that PY_ARRAY_UNIQUE_SYMBOL is uniquely defined for each extension.
174165
unique_array_api = '-DPY_ARRAY_UNIQUE_SYMBOL=MPL_@0@_ARRAY_API'.format(ext.replace('.', '_'))
175166
additions = {
176167
'c_args': [unique_array_api] + kwargs.get('c_args', []),
177-
'cpp_args': cpp_special_arguments + [unique_array_api] + kwargs.get('cpp_args', []),
168+
'cpp_args': [unique_array_api] + kwargs.get('cpp_args', []),
178169
}
179170
py3.extension_module(
180171
ext,

0 commit comments

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