Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[boost] Add default support for from_exception in non intel platforms #23881

Merged
merged 2 commits into from
May 8, 2024
Merged

[boost] Add default support for from_exception in non intel platforms #23881

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f66afa0
Fix support for from_exception in non intel platforms
uilianries May 6, 2024
b9f2d83
simplify stacktrace from except rule
uilianries May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions recipes/boost/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ def _has_cppstd_14_supported(self):
cppstd = self.settings.compiler.get_safe("cppstd")
if cppstd:
return valid_min_cppstd(self, 14)
required_compiler_version = self._min_compiler_version_default_cxx14
required_compiler_version = self._min_compiler_version_default_cxx14
if required_compiler_version:
msvc_versions = {14: 190, 15: 191, 16: 192, 17: 193}
compiler_version = Version(self.settings.compiler.version)
Expand Down Expand Up @@ -1317,7 +1317,7 @@ def add_defines(library):
cxx_flags.append("-fembed-bitcode")
if self._with_stacktrace_backtrace:
flags.append(f"-sLIBBACKTRACE_PATH={self.dependencies['libbacktrace'].package_folder}")
if self._stacktrace_from_exception_available and is_apple_os(self) and str(self.settings.compiler.libcxx) == "libc++":
if self._stacktrace_from_exception_available and is_apple_os(self) and (str(self.settings.compiler.libcxx) == "libc++" or "x86" not in str(self.settings.arch)):
uilianries marked this conversation as resolved.
Show resolved Hide resolved
# https://github.com/boostorg/stacktrace/blob/boost-1.85.0/src/from_exception.cpp#L29
flags.append("define=BOOST_STACKTRACE_LIBCXX_RUNTIME_MAY_CAUSE_MEMORY_LEAK=1")
if self._with_iconv:
Expand Down
Loading