Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/gmake/tests/cpp/test_make_linking.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

function suite.setup()
_TARGET_OS = "linux"
_ACTION = "gmake"
wks, prj = test.createWorkspace()
end

Expand Down
1 change: 1 addition & 0 deletions modules/gmake2/tests/test_gmake2_linking.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

function suite.setup()
_OS = "linux"
_ACTION = "gmake2"
wks, prj = test.createWorkspace()
end

Expand Down
7 changes: 6 additions & 1 deletion src/tools/gcc.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down