* Patch 3043933 gmake incorrectly links using -l when a solution contains a .so and .a of the same name and the static lib is wanted (Jonathan Derque)

1 files changed, 17 insertions, 1 deletions

diff --git a/src/tools/gcc.lua b/src/tools/gcc.lua
index 1f5fc74..771cd17 100644
--- a/src/tools/gcc.lua
+++ b/src/tools/gcc.lua
@@ -174,7 +174,23 @@
 
 	function premake.gcc.getlinkflags(cfg)
 		local result = { }
-		for _, value in ipairs(premake.getlinks(cfg, "all", "basename")) do
+		for _, value in ipairs(premake.getlinks(cfg, "dependencies", "object")) do
+			-- don't use "-llib" arguments when linking static libraries
+			if (value.kind == "StaticLib") then
+				local pathstyle = premake.getpathstyle(value)
+				local namestyle = premake.getnamestyle(value)
+				local linktarget = premake.gettarget(value, "link",  pathstyle, namestyle, cfg.system)
+				table.insert(result, linktarget.fullpath)
+			else
+				if path.getextension(value.basename) == ".framework" then
+					table.insert(result, '-framework ' .. _MAKE.esc(path.getbasename(value.basename)))
+				else
+					table.insert(result, '-l' .. _MAKE.esc(value.basename))
+				end
+			end
+		end
+		-- "-llib" is fine for system dependencies
+		for _, value in ipairs(premake.getlinks(cfg, "system", "basename")) do
 			if path.getextension(value) == ".framework" then
 				table.insert(result, '-framework ' .. _MAKE.esc(path.getbasename(value)))
 			else