diff options
| -rw-r--r-- | xmake/core/base/table.lua | 6 | ||||
| -rw-r--r-- | xmake/rules/utils/symbols/export_list/xmake.lua | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/xmake/core/base/table.lua b/xmake/core/base/table.lua index 9868c93d5..2cf617f3b 100644 --- a/xmake/core/base/table.lua +++ b/xmake/core/base/table.lua @@ -324,18 +324,12 @@ end -- wrap object to table function table.wrap(object) - - -- no object? if nil == object then return {} end - - -- wrap it if not table if type(object) ~= "table" then return {object} end - - -- ok return object end diff --git a/xmake/rules/utils/symbols/export_list/xmake.lua b/xmake/rules/utils/symbols/export_list/xmake.lua index b9b642d96..4184432a4 100644 --- a/xmake/rules/utils/symbols/export_list/xmake.lua +++ b/xmake/rules/utils/symbols/export_list/xmake.lua @@ -61,7 +61,7 @@ rule("utils.symbols.export_list") elseif target:is_plat("macosx", "iphoneos", "watchos", "appletvos") then exportkind = "apple" exportfile = path.join(target:autogendir(), "rules", "symbols", "export_list.exp") - target:add("shflags", {"-Wl,-exported_symbols_list", exportfile}, {force = true})--, expand = false}) + target:add("shflags", {"-Wl,-exported_symbols_list", exportfile}, {force = true, expand = false}) elseif target:has_tool("ld", "gcc", "gxx", "clang", "clangxx") or target:has_tool("sh", "gcc", "gxx", "clang", "clangxx") then exportkind = "ver" |