summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2022-03-15 09:23:39 +0800
committerGitHub <[email protected]>2022-03-15 09:23:39 +0800
commit18b910e27d60ee244ee2245071f33ff0fc821991 (patch)
tree783d2e1efb4adaaff188d6e91428170122c900eb
parentbc501387029826a8dbcb6a5b7776fd8f17e37d2f (diff)
parent021e25e6b38ea5ee9939c237e605fed8483cf228 (diff)
Merge pull request #2163 from cyfdecyf/dev
xrepo: export add toolchain option.
-rw-r--r--xmake/modules/private/xrepo/action/export.lua5
1 files changed, 5 insertions, 0 deletions
diff --git a/xmake/modules/private/xrepo/action/export.lua b/xmake/modules/private/xrepo/action/export.lua
index bb33429e1..fb8a006b8 100644
--- a/xmake/modules/private/xrepo/action/export.lua
+++ b/xmake/modules/private/xrepo/action/export.lua
@@ -42,6 +42,7 @@ function menu_options()
" - xrepo export -f \"vs_runtime='MD'\" zlib",
" - xrepo export -f \"regex=true,thread=true\" boost"},
{},
+ {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.",
@@ -85,6 +86,7 @@ function _export_packages(packages)
end
end
+ local oldir = os.curdir()
-- enter working project directory
local subdir = "working"
if packagefile then
@@ -119,6 +121,9 @@ function _export_packages(packages)
table.insert(config_argv, "-a")
table.insert(config_argv, option.get("arch"))
end
+ if option.get("toolchain") then
+ table.insert(config_argv, "--toolchain=" .. option.get("toolchain"))
+ end
local mode = option.get("mode")
if mode then
table.insert(config_argv, "-m")