summaryrefslogtreecommitdiff
path: root/xmake/platforms/linux
diff options
context:
space:
mode:
authorruki <[email protected]>2017-07-13 10:52:42 +0800
committerruki <[email protected]>2017-07-13 10:52:42 +0800
commitb7ae88c507b9afe89cd677ee81894e44a961a4b4 (patch)
treea8aca817b422ca83f76d8310678351eaa3f3cf75 /xmake/platforms/linux
parentb9e5a411e38224db1f71a39cad57cc54dc13fee6 (diff)
improve flags for linker and compiler
Diffstat (limited to 'xmake/platforms/linux')
-rw-r--r--xmake/platforms/linux/load.lua13
1 files changed, 6 insertions, 7 deletions
diff --git a/xmake/platforms/linux/load.lua b/xmake/platforms/linux/load.lua
index d71d22198..c62322e15 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 = 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")
+ _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" }
-- init flags for objc/c++ (with _g.ldflags and _g.shflags)
- _g.mxflags = table.wrap(archflags)
+ _g.mxflags = { archflags }
-- init flags for asm (with _g.ldflags and _g.shflags)
- _g.asflags = table.wrap(archflags)
+ _g.asflags = { archflags }
-- init flags for golang
_g["gc-ldflags"] = {}
@@ -80,4 +80,3 @@ function main()
return _g
end
-