From ca1eba2d96ed24fd2070b45de35c42ce3b37b066 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 28 Sep 2023 23:11:18 +0800 Subject: remove linkgroups from links --- xmake/modules/core/tools/gcc.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xmake/modules/core') diff --git a/xmake/modules/core/tools/gcc.lua b/xmake/modules/core/tools/gcc.lua index 864e894e5..7cff1d48d 100644 --- a/xmake/modules/core/tools/gcc.lua +++ b/xmake/modules/core/tools/gcc.lua @@ -305,13 +305,13 @@ function nf_syslink(self, lib) end -- make the link group flag -function nf_linkgroups(self, libs, target) +function nf_linkgroup(self, linkgroup, target) local flags = {} - for _, lib in ipairs(libs) do + for _, lib in ipairs(linkgroup) do table.insert(flags, nf_link(self, lib)) end if not target:is_plat("macosx", "windows", "mingw") then - local whole = target:extraconf("linkgroups", libs, "whole") + local whole = target:extraconf("linkgroups", linkgroup, "whole") if whole then table.insert(flags, 1, "-Wl,--whole-archive") table.insert(flags, "-Wl,--no-whole-archive") @@ -320,7 +320,7 @@ function nf_linkgroups(self, libs, target) table.insert(flags, "-Wl,--end-group") end end - return {flags} + return flags end -- make the linkdir flag -- cgit v1.3.1