Merge pull request #857 from xmake-io/toolchain

Improve toolchain to support host and cross toolchains at same time

1 files changed, 9 insertions, 1 deletions

diff --git a/xmake/modules/devel/git/ls_remote.lua b/xmake/modules/devel/git/ls_remote.lua
index a52e0d68d..1775567db 100644
--- a/xmake/modules/devel/git/ls_remote.lua
+++ b/xmake/modules/devel/git/ls_remote.lua
@@ -21,6 +21,7 @@
 -- imports
 import("core.base.option")
 import("lib.detect.find_tool")
+import("net.proxy")
 
 -- ls_remote to given branch, tag or commit
 --
@@ -55,8 +56,15 @@ function main(reftype, url)
         print("%s %s", git.program, os.args(argv))
     end
 
+    -- use proxy?
+    local envs
+    local proxy_conf = proxy.get(url)
+    if proxy_conf then
+        envs = {ALL_PROXY = proxy_conf}
+    end
+
     -- get refs
-    local data = os.iorunv(git.program, argv)
+    local data = os.iorunv(git.program, argv, {envs = envs})
 
     -- get commmits and tags
     local refs = {}