diff options
| author | ruki <[email protected]> | 2017-02-16 20:56:06 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-02-16 20:56:06 +0800 |
| commit | bd54ed5a6c59f75ad768d4d37843262314dd1aa1 (patch) | |
| tree | 2382825d52d1940f4f7a0f43abac6d10780f98af | |
| parent | b98e6978cd6514169c7f0fea4ab6ba63a093754c (diff) | |
fix os.iorun bug
| -rw-r--r-- | xmake/core/base/os.lua | 2 | ||||
| -rw-r--r-- | xmake/core/project/target.lua | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xmake/core/base/os.lua b/xmake/core/base/os.lua index 9e8e90b35..40527b587 100644 --- a/xmake/core/base/os.lua +++ b/xmake/core/base/os.lua @@ -531,7 +531,7 @@ function os.iorunv(shellname, argv) os.rm(errfile) -- ok? - return ok == 0, outfile, errdata + return ok == 0, outdata, errdata end -- raise an exception and abort the current script diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua index 0975e4eac..51bb60630 100644 --- a/xmake/core/project/target.lua +++ b/xmake/core/project/target.lua @@ -331,8 +331,8 @@ function target:objectfile(sourcefile) -- .e.g -- -- src/xxx.c - -- project/xmake.lua - -- build/.objs + -- project/xmake.lua + -- build/.objs -- -- objectfile: project/build/.objs/xxxx/../../xxx.c will be out of range for objectdir -- |