Skip to content

Commit

Permalink
(#15824) libbacktrace: retrieve automake wrapper scripts using newer …
Browse files Browse the repository at this point in the history
…user conf
  • Loading branch information
jcar87 authored Feb 9, 2023
1 parent d5b4493 commit 6a19ce1
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions recipes/libbacktrace/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ class LibbacktraceConan(ConanFile):
def _settings_build(self):
return getattr(self, "settings_build", self.settings)

@property
def _user_info_build(self):
return getattr(self, "user_info_build", self.deps_user_info)

def export_sources(self):
export_conandata_patches(self)

Expand Down Expand Up @@ -81,8 +77,8 @@ def generate(self):

if is_msvc(self):
env = Environment()
compile_wrapper = unix_path(self, self._user_info_build["automake"].compile)
ar_wrapper = unix_path(self, self._user_info_build["automake"].ar_lib)
compile_wrapper = unix_path(self, self.conf.get("user.automake:compile-wrapper"))
ar_wrapper = unix_path(self, self.conf.get("user.automake:lib-wrapper"))
env.define("CC", f"{compile_wrapper} cl -nologo")
env.define("CXX", f"{compile_wrapper} cl -nologo")
env.define("LD", "link -nologo")
Expand Down

0 comments on commit 6a19ce1

Please sign in to comment.