diff options
Diffstat (limited to 'xmake/modules/private/xrepo/action/fetch.lua')
| -rw-r--r-- | xmake/modules/private/xrepo/action/fetch.lua | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/xmake/modules/private/xrepo/action/fetch.lua b/xmake/modules/private/xrepo/action/fetch.lua index 06178d02b..6fc25656c 100644 --- a/xmake/modules/private/xrepo/action/fetch.lua +++ b/xmake/modules/private/xrepo/action/fetch.lua @@ -30,29 +30,30 @@ function menu_options() -- menu options local options = { - {'k', "kind", "kv", nil, "Enable static/shared library.", - values = {"static", "shared"} }, - {'p', "plat", "kv", nil, "Set the given platform." }, - {'a', "arch", "kv", nil, "Set the given architecture." }, - {'m', "mode", "kv", nil, "Set the given mode.", - values = {"release", "debug"} }, - {'f', "configs", "kv", nil, "Set the given extra package configs.", + {'k', "kind", "kv", nil, "Enable static/shared library.", + values = {"static", "shared"}}, + {'p', "plat", "kv", nil, "Set the given platform." }, + {'a', "arch", "kv", nil, "Set the given architecture." }, + {'m', "mode", "kv", nil, "Set the given mode.", + values = {"release", "debug"}}, + {'f', "configs", "kv", nil, "Set the given extra package configs.", "e.g.", " - xrepo fetch --configs=\"runtimes='MD'\" zlib", - " - xrepo fetch --configs=\"regex=true,thread=true\" boost"}, - {nil, "system", "k", "false", "Only fetch package on current system."}, - {}, - {nil, "toolchain", "kv", nil, "Set the toolchain name." }, - {nil, "includes", "kv", nil, "Includes extra lua configuration files.", + " - xrepo fetch --configs=\"regex=true,thread=true\" boost" }, + {nil, "system", "k", "false", "Only fetch package on current system." }, + { }, + {nil, "toolchain", "kv", nil, "Set the toolchain name." }, + {nil, "toolchain_host", "kv", nil, "Set the host toolchain name." }, + {nil, "includes", "kv", nil, "Includes extra lua configuration files.", "e.g.", - " - xrepo fetch -p cross --toolchain=mytool --includes='toolchain1.lua" .. path.envsep() .. "toolchain2.lua'"}, - {nil, "deps", "k", nil, "Fetch packages with dependencies." }, - {nil, "cflags", "k", nil, "Fetch cflags of the given packages." }, - {nil, "ldflags", "k", nil, "Fetch ldflags of the given packages."}, - {'e', "external", "k", nil, "Show cflags as external packages with -isystem."}, - {nil, "json", "k", nil, "Output package info as json format." }, - {}, - {nil, "packages", "vs", nil, "The packages list.", + " - xrepo fetch -p cross --toolchain=mytool --includes='toolchain1.lua" .. path.envsep() .. "toolchain2.lua'" }, + {nil, "deps", "k", nil, "Fetch packages with dependencies." }, + {nil, "cflags", "k", nil, "Fetch cflags of the given packages." }, + {nil, "ldflags", "k", nil, "Fetch ldflags of the given packages." }, + {'e', "external", "k", nil, "Show cflags as external packages with -isystem." }, + {nil, "json", "k", nil, "Output package info as json format." }, + { }, + {nil, "packages", "vs", nil, "The packages list.", "e.g.", " - xrepo fetch zlib boost", " - xrepo fetch /tmp/zlib.lua", @@ -62,7 +63,7 @@ function menu_options() " - xrepo fetch conan::zlib/1.2.11 vcpkg::zlib", " - xrepo fetch brew::zlib", " - xrepo fetch system::zlib (from pkgconfig, brew, /usr/lib ..)", - " - xrepo fetch pkgconfig::zlib"} + " - xrepo fetch pkgconfig::zlib" } } -- show menu options @@ -138,6 +139,9 @@ function _fetch_packages(packages) if option.get("toolchain") then table.insert(config_argv, "--toolchain=" .. option.get("toolchain")) end + if option.get("toolchain_host") then + table.insert(config_argv, "--toolchain_host=" .. option.get("toolchain_host")) + end local mode = option.get("mode") if mode then table.insert(config_argv, "-m") |