Skip to content

Commit

Permalink
libffi - fix to support updated automake recipe - waiting on conan-io…
Browse files Browse the repository at this point in the history
  • Loading branch information
paulharris committed Nov 28, 2022
1 parent 2822fb5 commit 2791ce0
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions recipes/libffi/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,13 @@ def generate(self):
compile_wrapper = unix_path(self, os.path.join(self.source_folder, "msvcc.sh"))
if architecture_flag:
compile_wrapper = f"{compile_wrapper} {architecture_flag}"
# FIXME: Use the conf once https://github.com/conan-io/conan-center-index/pull/12898 is merged
# env.define("AR", f"{unix_path(self, self.conf.get('tools.automake:ar-lib'))}")
[version_major, version_minor, _] = self.dependencies.direct_build['automake'].ref.version.split(".", 2)
automake_version = f"{version_major}.{version_minor}"
ar_wrapper = unix_path(self, os.path.join(self.dependencies.direct_build['automake'].cpp_info.resdirs[0], f"automake-{automake_version}", "ar-lib"))
env.define("CC", f"{compile_wrapper}")
env.define("CXX", f"{compile_wrapper}")
env.define("LD", "link -nologo")
env.define("AR", f"{ar_wrapper} \"lib -nologo\"")
breakpoint()
env.define("AR", f"{unix_path(self, self.conf.get('user.automake:ar-lib'))}")
env.define("NM", "dumpbin -symbols")
env.define("OBJDUMP", ":")
env.define("RANLIB", ":")
Expand Down

0 comments on commit 2791ce0

Please sign in to comment.