diff options
| author | ruki <[email protected]> | 2020-09-19 11:11:30 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-09-19 11:11:30 +0800 |
| commit | 93236f01c005ed4ea1f961558769bb0fd02ea4d2 (patch) | |
| tree | 008b3d70f141567f06ace0a4661cb5f52d1d1a1a | |
| parent | 31746c6a7856205fc1336d4bbc6cd303a4466e51 (diff) | |
improve emcc and wasm
| -rw-r--r-- | xmake/core/platform/platform.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/core/tools/emcc.lua | 6 | ||||
| -rw-r--r-- | xmake/rules/qt/load.lua | 1 |
3 files changed, 1 insertions, 8 deletions
diff --git a/xmake/core/platform/platform.lua b/xmake/core/platform/platform.lua index 5f75a7588..5fe693a1e 100644 --- a/xmake/core/platform/platform.lua +++ b/xmake/core/platform/platform.lua @@ -159,7 +159,7 @@ function _instance:toolchains(opt) end end if names then - for _, name in ipairs(names) do + for _, name in ipairs(table.wrap(names)) do local toolchain_inst, errors = toolchain.load(name, {plat = self:name(), arch = self:arch()}) -- attempt to load toolchain from project if not toolchain_inst and platform._project() then diff --git a/xmake/modules/core/tools/emcc.lua b/xmake/modules/core/tools/emcc.lua index 8ec5ca4ea..354f68d28 100644 --- a/xmake/modules/core/tools/emcc.lua +++ b/xmake/modules/core/tools/emcc.lua @@ -23,12 +23,6 @@ inherit("gcc") -- make the strip flag function nf_strip(self, level) - local maps = - { - debug = "-Wl,-S" - , all = "-s" - } - return maps[level] end -- make the rpathdir flag diff --git a/xmake/rules/qt/load.lua b/xmake/rules/qt/load.lua index 47f93789d..e9b9ea4c1 100644 --- a/xmake/rules/qt/load.lua +++ b/xmake/rules/qt/load.lua @@ -255,7 +255,6 @@ function main(target, opt) end target:add("includedirs", path.join(qt.mkspecsdir, "macx-clang")) target:add("linkdirs", qt.libdir) - elseif is_plat("linux") then target:set("frameworks", nil) target:add("includedirs", qt.includedir) |