From 4de40c8e54d44e5f0d99efc6791b2ee5466156e2 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 10 Nov 2020 23:48:29 +0800 Subject: improve zig support for 0.7.0 --- xmake/modules/core/tools/zig.lua | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'xmake/modules/core/tools/zig.lua') diff --git a/xmake/modules/core/tools/zig.lua b/xmake/modules/core/tools/zig.lua index c9927a382..81d06c0da 100644 --- a/xmake/modules/core/tools/zig.lua +++ b/xmake/modules/core/tools/zig.lua @@ -53,12 +53,12 @@ end function nf_optimize(self, level) local maps = { - none = "-O0" - , fast = "--release-safe" - , aggressive = "--release-fast" - , fastest = "--release-fast" - , smallest = "--release-small" - , aggressive = "--release-fast" + none = "-O Debug" + , fast = "-O ReleaseSafe" + , aggressive = "-O ReleaseFast" + , fastest = "-O ReleaseFast" + , smallest = "-O ReleaseSmall" + , aggressive = "-O ReleaseFast" } return maps[level] end @@ -111,12 +111,7 @@ function linkargv(self, objectfiles, targetkind, targetfile, flags) else raise("unknown target kind(%s)!", targetkind) end - local name = targetkind == "binary" and path.basename(targetfile) or target.linkname(path.filename(targetfile)) - table.join2(argv, flags, "--output-dir", path.directory(targetfile), "--name", name) - for _, objectfile in ipairs(objectfiles) do - table.insert(argv, "--object") - table.insert(argv, objectfile) - end + table.join2(argv, flags, "-femit-bin=" .. targetfile, objectfiles) return self:program(), argv end @@ -132,7 +127,7 @@ end -- make the compile arguments list function compargv(self, sourcefile, objectfile, flags) - return self:program(), table.join("build-obj", flags, "--output-dir", path.directory(objectfile), "--name", path.basename(objectfile), sourcefile) + return self:program(), table.join("build-obj", flags, "-femit-bin=" .. objectfile, sourcefile) end -- compile the source file -- cgit v1.3.1