From e3ec9c152f3ca5d6a3e07ef44a82b31cadb616e9 Mon Sep 17 00:00:00 2001 From: Chen Yufei Date: Tue, 15 Mar 2022 07:40:24 +0800 Subject: xrepo: export add toolchain option. --- xmake/modules/private/xrepo/action/export.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xmake/modules/private/xrepo/action/export.lua b/xmake/modules/private/xrepo/action/export.lua index bb33429e1..66517bf79 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.", @@ -119,6 +120,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") -- cgit v1.3.1 From 021e25e6b38ea5ee9939c237e605fed8483cf228 Mon Sep 17 00:00:00 2001 From: Chen Yufei Date: Tue, 15 Mar 2022 08:04:55 +0800 Subject: fix: xrepo export export to current working dir. --- xmake/modules/private/xrepo/action/export.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/xmake/modules/private/xrepo/action/export.lua b/xmake/modules/private/xrepo/action/export.lua index 66517bf79..fb8a006b8 100644 --- a/xmake/modules/private/xrepo/action/export.lua +++ b/xmake/modules/private/xrepo/action/export.lua @@ -86,6 +86,7 @@ function _export_packages(packages) end end + local oldir = os.curdir() -- enter working project directory local subdir = "working" if packagefile then -- cgit v1.3.1