Fix shared library $ORIGIN escape for non-gmake actions.

premake · Sep 19, 2024 · e8ecd26 · e8ecd26
1 parent 9a70afe
commit e8ecd26
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/modules/gmake/tests/cpp/test_make_linking.lua b/modules/gmake/tests/cpp/test_make_linking.lua
@@ -18,6 +18,7 @@
 
 	function suite.setup()
 		_TARGET_OS = "linux"
+		_ACTION = "gmake"
 		wks, prj = test.createWorkspace()
 	end
 

diff --git a/modules/gmake2/tests/test_gmake2_linking.lua b/modules/gmake2/tests/test_gmake2_linking.lua
@@ -20,6 +20,7 @@
 
 	function suite.setup()
 		_OS = "linux"
+		_ACTION = "gmake2"
 		wks, prj = test.createWorkspace()
 	end
 

diff --git a/src/tools/gcc.lua b/src/tools/gcc.lua
@@ -412,7 +412,12 @@
 				rpath = "@loader_path/" .. rpath
 			elseif (cfg.system == p.LINUX) then
 				rpath = iif(rpath == ".", "", "/" .. rpath)
-				rpath = "$$ORIGIN" .. rpath
+				local origin = "$ORIGIN"
+				-- need to escape the $ for make if using gmake actions
+				if string.startswith(_ACTION, "gmake") then
+					origin = "$" .. origin
+				end
+				rpath = origin .. rpath
 			end
 
 			if mode == "linker" then