Allow for absolute runpath directories (#2579)

Author: nickclark2016

src/tools/gcc.lua

@@ -439,19 +439,29 @@
 		end
 
 		for _, fullpath in ipairs(dirs) do
+			-- Try to make rpath relative to target dir
 			local rpath = path.getrelative(cfg.buildtarget.directory, fullpath)
-			if table.contains(os.getSystemTags(cfg.system), "darwin") then
-				rpath = "@loader_path/" .. rpath
-			elseif (cfg.system == p.LINUX) then
-				rpath = iif(rpath == ".", "", "/" .. rpath)
-				rpath = "$$ORIGIN" .. rpath
-			end
 
-			if mode == "linker" then
-				rpath = "-Wl,-rpath,'" .. rpath .. "'"
-			end
+			if path.isabsolute(rpath) then				
+				if mode == "linker" then
+					rpath = "-Wl,-rpath,'" .. rpath .. "'"
+				end
 
-			table.insert(result, rpath)
+				table.insert(result, rpath)
+			else
+				if table.contains(os.getSystemTags(cfg.system), "darwin") then
+					rpath = "@loader_path/" .. rpath
+				elseif (cfg.system == p.LINUX) then
+					rpath = iif(rpath == ".", "", "/" .. rpath)
+					rpath = "$$ORIGIN" .. rpath
+				end
+
+				if mode == "linker" then
+					rpath = "-Wl,-rpath,'" .. rpath .. "'"
+				end
+
+				table.insert(result, rpath)
+			end
 		end
 
 		return result

tests/tools/test_gcc.lua

@@ -1400,3 +1400,36 @@ end
 		test.contains({ "-pg" }, gcc.getcxxflags(cfg))
 		test.contains({ "-pg" }, gcc.getldflags(cfg))
 	end
+
+--
+-- Test runpath dirs
+--
+
+	function suite.runpathdirs_onRelativeDir()	
+		local paths = { "libs" }
+		
+		runpathdirs(paths)
+		prepare()
+    
+		test.contains({ "-Wl,-rpath,'$$ORIGIN/libs'" }, gcc.getrunpathdirs(cfg, paths))
+	end
+
+
+	function suite.runpathdirs_onRelativeDir_macosx()	
+		local paths = { "libs" }
+		
+		system("MacOSX")
+		runpathdirs(paths)
+		prepare()
+	
+		test.contains({ "-Wl,-rpath,'@loader_path/libs'" }, gcc.getrunpathdirs(cfg, paths))
+	end
+
+	function suite.runpathdirs_onAbsoluteDir()	
+		local paths = { "/usr/local/lib/mylibs" }
+		
+		runpathdirs(paths)
+		prepare()
+	
+		test.contains({ "-Wl,-rpath,'/usr/local/lib/mylibs'" }, gcc.getrunpathdirs(cfg, paths))
+	end