diff options
| -rw-r--r-- | xmake/core/base/cli.lua | 3 | ||||
| -rw-r--r-- | xmake/modules/package/tools/xmake.lua | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/xmake/core/base/cli.lua b/xmake/core/base/cli.lua index effa1a0f2..c163c3c90 100644 --- a/xmake/core/base/cli.lua +++ b/xmake/core/base/cli.lua @@ -27,6 +27,7 @@ local string = require("base/string") local hashset = require("base/hashset") segment.__index = segment +cli._segment = segment function segment:__tostring() return self.string @@ -121,7 +122,5 @@ function cli.parsev(argv, flags) return parsed end -cli._segment = segment - -- return module return cli diff --git a/xmake/modules/package/tools/xmake.lua b/xmake/modules/package/tools/xmake.lua index 787597358..8689bcd1d 100644 --- a/xmake/modules/package/tools/xmake.lua +++ b/xmake/modules/package/tools/xmake.lua @@ -38,19 +38,19 @@ function _get_configs(package, configs) end table.insert(configs, "--mode=" .. (package:debug() and "debug" or "release")) if cflags then - table.insert(configs, "--cflags=" .. os.args(table.concat(cflags, ' '))) + table.insert(configs, "--cflags=" .. table.concat(cflags, ' ')) end if cxflags then - table.insert(configs, "--cxflags=" .. os.args(table.concat(cxflags, ' '))) + table.insert(configs, "--cxflags=" .. table.concat(cxflags, ' ')) end if cxxflags then - table.insert(configs, "--cxxflags=" .. os.args(table.concat(cxxflags, ' '))) + table.insert(configs, "--cxxflags=" .. table.concat(cxxflags, ' ')) end if asflags then - table.insert(configs, "--asflags=" .. os.args(table.concat(asflags, ' '))) + table.insert(configs, "--asflags=" .. table.concat(asflags, ' ')) end if ldflags then - table.insert(configs, "--ldflags=" .. os.args(table.concat(ldflags, ' '))) + table.insert(configs, "--ldflags=" .. table.concat(ldflags, ' ')) end return configs end |