diff options
| author | Ângelo Andrade Cirino <[email protected]> | 2021-07-15 23:23:48 -0300 |
|---|---|---|
| committer | Ângelo Andrade Cirino <[email protected]> | 2021-07-15 23:23:48 -0300 |
| commit | 81ad292ea67f82d88d785a37d23b1f1603996da1 (patch) | |
| tree | 817b50173948547f7e4b491da271918c67b8a5ff /xmake/modules/core/tools/zig.lua | |
| parent | 942c32f448d9b8a850438aa2af1de2415b7ae872 (diff) | |
| parent | 8c1141aba414c07554179cb28687124514f6e770 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'xmake/modules/core/tools/zig.lua')
| -rw-r--r-- | xmake/modules/core/tools/zig.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xmake/modules/core/tools/zig.lua b/xmake/modules/core/tools/zig.lua index ce03bc3cd..2270e2a3e 100644 --- a/xmake/modules/core/tools/zig.lua +++ b/xmake/modules/core/tools/zig.lua @@ -75,29 +75,29 @@ end -- make the linkdir flag function nf_linkdir(self, dir) - return "-L" .. os.args(dir) + return {"-L", dir} end -- make the framework flag function nf_framework(self, framework) - return "-framework " .. framework + return {"-framework", framework} end -- make the frameworkdir flag function nf_frameworkdir(self, frameworkdir) - return "-F " .. os.args(path.translate(frameworkdir)) + return {"-F", path.translate(frameworkdir)} end -- make the rpathdir flag function nf_rpathdir(self, dir) dir = path.translate(dir) if is_plat("macosx") then - return "-rpath " .. os.args(dir:gsub("%$ORIGIN", "@loader_path")) + return {"-rpath", (dir:gsub("%$ORIGIN", "@loader_path"))} else - return "-rpath " .. os.args(dir:gsub("@[%w_]+", function (name) + return {"-rpath", (dir:gsub("@[%w_]+", function (name) local maps = {["@loader_path"] = "$ORIGIN", ["@executable_path"] = "$ORIGIN"} return maps[name] - end)) + end))} end end |
