fix the current directory changed when building

1 files changed, 17 insertions, 1 deletions

diff --git a/xmake/core/base/os.lua b/xmake/core/base/os.lua
index 61e19cd84..ae93103eb 100644
--- a/xmake/core/base/os.lua
+++ b/xmake/core/base/os.lua
@@ -318,6 +318,11 @@ function os.exec(cmd, outfile, errfile)
         local waitok = -1
         local status = -1 
         if coroutine.running() then
+
+            -- save the current directory
+            local curdir = os.curdir()
+
+            -- wait it
             repeat
                 -- poll it
                 waitok, status = process.wait(proc, 0)
@@ -325,6 +330,9 @@ function os.exec(cmd, outfile, errfile)
                     coroutine.yield()
                 end
             until waitok ~= 0
+
+            -- resume the current directory
+            os.cd(curdir)
         else
             waitok, status = process.wait(proc, -1)
         end
@@ -354,13 +362,21 @@ function os.execv(shellname, argv, outfile, errfile)
         local waitok = -1
         local status = -1 
         if coroutine.running() then
+
+            -- save the current directory
+            local curdir = os.curdir()
+
+            -- wait it
             repeat
                 -- poll it
-                waitok, status = process.wait(prpoc, 0)
+                waitok, status = process.wait(proc, 0)
                 if waitok == 0 then
                     coroutine.yield()
                 end
             until waitok ~= 0
+
+            -- resume the current directory
+            os.cd(curdir)
         else
             waitok, status = process.wait(proc, -1)
         end