diff options
| author | ruki <[email protected]> | 2017-07-11 14:51:52 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-07-11 14:51:52 +0800 |
| commit | 410a36dad68dc1f0b2ac9c12d861af7ab8d0b1d6 (patch) | |
| tree | e33e94caea84d3a170f6dd86c36ac2e4adbd6687 /xmake/platforms/linux/load.lua | |
| parent | 03420ca44581f299a48935ca60af4824575cd9c1 (diff) | |
rename has_flag to has_flags
Diffstat (limited to 'xmake/platforms/linux/load.lua')
| -rw-r--r-- | xmake/platforms/linux/load.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xmake/platforms/linux/load.lua b/xmake/platforms/linux/load.lua index 003b31909..d71d22198 100644 --- a/xmake/platforms/linux/load.lua +++ b/xmake/platforms/linux/load.lua @@ -48,20 +48,20 @@ function main() if arch then if arch == "x86_64" then archflags = "-m64" elseif arch == "i386" then archflags = "-m32" - else archflags = "-arch " .. arch + else archflags = {"-arch", arch} end end -- init flags for c/c++ - _g.cxflags = { archflags, "-I/usr/local/include", "-I/usr/include" } - _g.ldflags = { archflags, "-L/usr/local/lib", "-L/usr/lib" } - _g.shflags = { archflags, "-L/usr/local/lib", "-L/usr/lib" } + _g.cxflags = table.join(table.wrap(archflags), "-I/usr/local/include", "-I/usr/include") + _g.ldflags = table.join(table.wrap(archflags), "-L/usr/local/lib", "-L/usr/lib") + _g.shflags = table.join(table.wrap(archflags), "-L/usr/local/lib", "-L/usr/lib") -- init flags for objc/c++ (with _g.ldflags and _g.shflags) - _g.mxflags = { archflags } + _g.mxflags = table.wrap(archflags) -- init flags for asm (with _g.ldflags and _g.shflags) - _g.asflags = { archflags } + _g.asflags = table.wrap(archflags) -- init flags for golang _g["gc-ldflags"] = {} |
