diff options
| -rw-r--r-- | xmake/core/sandbox/modules/import/core/platform/platform.lua | 16 | ||||
| -rw-r--r-- | xmake/modules/private/action/require/impl/package.lua | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/xmake/core/sandbox/modules/import/core/platform/platform.lua b/xmake/core/sandbox/modules/import/core/platform/platform.lua index 90cb487e2..0104ce40d 100644 --- a/xmake/core/sandbox/modules/import/core/platform/platform.lua +++ b/xmake/core/sandbox/modules/import/core/platform/platform.lua @@ -26,8 +26,8 @@ local platform = require("platform/platform") local raise = require("sandbox/modules/raise") -- load the current platform -function sandbox_core_platform.load(plat, arch) - local instance, errors = platform.load(plat, arch) +function sandbox_core_platform.load(plat, arch, opt) + local instance, errors = platform.load(plat, arch, opt) if not instance then raise(errors) end @@ -55,21 +55,21 @@ function sandbox_core_platform.archs(plat, arch) end -- get the current platform configuration -function sandbox_core_platform.get(name, plat, arch) - return platform.get(name, plat, arch) +function sandbox_core_platform.get(name, plat, arch, opt) + return platform.get(name, plat, arch, opt) end -- get the platform tool from the kind -- -- e.g. cc, cxx, mm, mxx, as, ar, ld, sh, .. -- -function sandbox_core_platform.tool(toolkind, plat, arch) - return platform.tool(toolkind, plat, arch) +function sandbox_core_platform.tool(toolkind, plat, arch, opt) + return platform.tool(toolkind, plat, arch, opt) end -- get the current platform tool configuration -function sandbox_core_platform.toolconfig(name, plat, arch) - return platform.toolconfig(name, plat, arch) +function sandbox_core_platform.toolconfig(name, plat, arch, opt) + return platform.toolconfig(name, plat, arch, opt) end -- return module diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua index c3fbdd0d0..18d4db592 100644 --- a/xmake/modules/private/action/require/impl/package.lua +++ b/xmake/modules/private/action/require/impl/package.lua @@ -487,7 +487,7 @@ function _check_package_toolchains(package) end else -- maybe this package is host package, it's platform and toolchain has been not checked yet. - local platform_inst = platform.load(package:plat(), package:arch()) + local platform_inst = platform.load(package:plat(), package:arch(), {host = package:is_host()}) if not platform_inst:check() then raise("no any matched platform for this package(%s)!", package:name()) end |
