diff options
| author | ruki <[email protected]> | 2020-12-16 23:56:23 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-12-16 23:56:23 +0800 |
| commit | 1392992e8e941f188238c31ca9282bdd2f3d4531 (patch) | |
| tree | 3e280c5ac73bd6438d590e8659a73efdd55fbca7 /xmake/modules | |
| parent | c3bec4b1e483f5bcf443cf1a26b3b8bd8cfa2fba (diff) | |
fix some old cached configs
Diffstat (limited to 'xmake/modules')
| -rw-r--r-- | xmake/modules/package/manager/conan/install_package.lua | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/xmake/modules/package/manager/conan/install_package.lua b/xmake/modules/package/manager/conan/install_package.lua index 8e7561826..cc7721527 100644 --- a/xmake/modules/package/manager/conan/install_package.lua +++ b/xmake/modules/package/manager/conan/install_package.lua @@ -21,6 +21,7 @@ -- imports import("core.base.option") import("core.project.config") +import("core.tool.toolchain") import("core.platform.platform") import("lib.detect.find_tool") import("devel.git") @@ -219,7 +220,11 @@ function main(name, opt) table.insert(argv, "compiler.runtime=" .. opt.vs_runtime) end elseif opt.plat == "iphoneos" then - local target_minver = config.get("target_minver_iphoneos") + local target_minver = nil + local toolchain_xcode = toolchain.load("xcode", {plat = opt.plat, arch = opt.arch}) + if toolchain_xcode then + target_minver = toolchain_xcode:config("target_minver") + end if target_minver and tonumber(target_minver) > 10 and (arch == "armv7" or arch == "armv7s" or arch == "x86") then target_minver = "10" -- iOS 10 is the maximum deployment target for 32-bit targets end |
