diff --git a/recipes/libiconv/all/conanfile.py b/recipes/libiconv/all/conanfile.py index e9aa09b..54f8c48 100644 --- a/recipes/libiconv/all/conanfile.py +++ b/recipes/libiconv/all/conanfile.py @@ -1,3 +1,6 @@ +import os +import posixpath + from conan import ConanFile from conan.tools.apple import fix_apple_shared_install_name from conan.tools.build import cross_building @@ -16,7 +19,6 @@ from conan.tools.layout import basic_layout from conan.tools.microsoft import is_msvc, unix_path from conan.tools.scm import Version -import os required_conan_version = ">=1.54.0" @@ -152,21 +154,21 @@ def generate(self): # using posixpath, not os path, # because NDK on Windows is problematic with backslashes - toolchain = os.posixpath.join(android_ndk_home, "toolchains", "llvm", "prebuilt", build_machine, "bin") + toolchain = posixpath.join(android_ndk_home, "toolchains", "llvm", "prebuilt", build_machine, "bin") if self.settings_build.os == "Windows": executable_suffix = ".exe" else: executable_suffix = "" - env.define("AR", os.posixpath.join(toolchain, "llvm-ar" + executable_suffix)) - env.define("AS", os.posixpath.join(toolchain, "llvm-as" + executable_suffix)) - env.define("RANLIB", os.posixpath.join(toolchain, "llvm-ranlib" + executable_suffix)) - env.define("CC", os.posixpath.join(toolchain, "{}{}-clang".format(target_host_triple, api_level))) - env.define("CXX", os.posixpath.join(toolchain, "{}{}-clang++".format(target_host_triple, api_level))) - env.define("LD", os.posixpath.join(toolchain, "ld" + executable_suffix)) - env.define("STRIP", os.posixpath.join(toolchain, "llvm-strip" + executable_suffix)) - print("[CC]: {}".format(os.posixpath.join(toolchain, "{}{}-clang".format(target_host_triple, api_level)))) + env.define("AR", posixpath.join(toolchain, "llvm-ar" + executable_suffix)) + env.define("AS", posixpath.join(toolchain, "llvm-as" + executable_suffix)) + env.define("RANLIB", posixpath.join(toolchain, "llvm-ranlib" + executable_suffix)) + env.define("CC", posixpath.join(toolchain, "{}{}-clang".format(target_host_triple, api_level))) + env.define("CXX", posixpath.join(toolchain, "{}{}-clang++".format(target_host_triple, api_level))) + env.define("LD", posixpath.join(toolchain, "ld" + executable_suffix)) + env.define("STRIP", posixpath.join(toolchain, "llvm-strip" + executable_suffix)) + print("[CC]: {}".format(posixpath.join(toolchain, "{}{}-clang".format(target_host_triple, api_level)))) tc.generate(env) def _apply_resource_patch(self):