diff options
| author | ruki <[email protected]> | 2024-09-21 00:38:24 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2024-09-23 09:43:53 +0800 |
| commit | 4fd8d5eec226060ee62b24c56ae4e303d4ededba (patch) | |
| tree | 6094540f11896427cce7373e4e37d983dfc56951 /xmake/modules/private/xrepo/action/export.lua | |
| parent | 478972cd989f6788925669b91d0bd8b4b38b2604 (diff) | |
improve host toolchain #5639
Diffstat (limited to 'xmake/modules/private/xrepo/action/export.lua')
| -rw-r--r-- | xmake/modules/private/xrepo/action/export.lua | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/xmake/modules/private/xrepo/action/export.lua b/xmake/modules/private/xrepo/action/export.lua index e5a0fc786..1b6e2e885 100644 --- a/xmake/modules/private/xrepo/action/export.lua +++ b/xmake/modules/private/xrepo/action/export.lua @@ -31,28 +31,29 @@ 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 export -f \"runtimes='MD'\" zlib", - " - xrepo export -f \"regex=true,thread=true\" boost"}, - {}, - {nil, "includes", "kv", nil, "Includes extra lua configuration files."}, - {nil, "toolchain", "kv", nil, "Set the toolchain name." }, - {nil, "shallow", "k", nil, "Does not export dependent packages."}, - {'o', "packagedir", "kv", "packages","Set the exported packages directory."}, - {nil, "packages", "vs", nil, "The packages list.", + " - xrepo export -f \"regex=true,thread=true\" boost" }, + { }, + {nil, "includes", "kv", nil, "Includes extra lua configuration files." }, + {nil, "toolchain", "kv", nil, "Set the toolchain name." }, + {nil, "toolchain_host", "kv", nil, "Set the host toolchain name." }, + {nil, "shallow", "k", nil, "Does not export dependent packages." }, + {'o', "packagedir", "kv", "packages","Set the exported packages directory." }, + {nil, "packages", "vs", nil, "The packages list.", "e.g.", " - xrepo export zlib boost", " - xrepo export -p iphoneos -a arm64 \"zlib >=1.2.0\"", " - xrepo export -p android -m debug \"pcre2 10.x\"", " - xrepo export -p mingw -k shared zlib", - " - xrepo export conan::zlib/1.2.11 vcpkg::zlib"} + " - xrepo export conan::zlib/1.2.11 vcpkg::zlib" } } -- show menu options @@ -129,6 +130,9 @@ function _export_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") |