summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2016-05-05 17:26:05 +0800
committerruki <[email protected]>2016-05-05 17:26:05 +0800
commit901771bcb402b51b27684d4e793ce3ca98df4a29 (patch)
treea7684a7674c0ae9e1345724173c24fe0a031862d
parent821d31bdb20facfb18a70b355918b15b015ed7b1 (diff)
fix builder bug for windows
-rwxr-xr-xxmake/actions/build/builder.lua7
1 files changed, 4 insertions, 3 deletions
diff --git a/xmake/actions/build/builder.lua b/xmake/actions/build/builder.lua
index 0c5b24378..8efe5609f 100755
--- a/xmake/actions/build/builder.lua
+++ b/xmake/actions/build/builder.lua
@@ -83,7 +83,7 @@ function _make_object(target, sourcefile, objectfile)
os.mkdir(path.directory(objectfile))
-- run cmd
- os.run(command)
+ compiler:run(command)
end
-- make objects for the given target
@@ -113,7 +113,8 @@ function _make_target(target)
_make_objects(target)
-- make the command for linking target
- local command = target:linker():command(target, target:objectfiles(), target:targetfile())
+ local linker = target:linker()
+ local command = linker:command(target, target:objectfiles(), target:targetfile())
-- trace
print("linking.$(mode) %s", path.filename(target:targetfile()))
@@ -127,7 +128,7 @@ function _make_target(target)
os.mkdir(path.directory(target:targetfile()))
-- run command
- os.run(command)
+ linker:run(command)
-- make headers
local srcheaders, dstheaders = target:headerfiles()