phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixes incorrect exclusion of rpath that broke shared lib loading. Refs #1421, #1516

Browse Source 
This was SVN commit r12198.
This commit is contained in:
historic_bruno 2012-07-26 13:33:04 +00:00
parent 3050cdc8c6
commit 9b79ca5179
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/premake/premake4.lua
View File

@ -308,9 +308,9 @@ function project_set_build_flags()
defines { "INSTALLED_LIBDIR=" .. _OPTIONS["libdir"] }
end
if (os.is("linux") or os.is("bsd")) and not _OPTIONS["with-system-mozjs185"] then
-- To use our local SpiderMonkey library, it needs to be part of the
-- runtime dynamic linker path. Add it with -rpath to make sure it gets found.
if os.is("linux") or os.is("bsd") then
-- To use our local shared libraries, they need to be found in the
-- runtime dynamic linker path. Add their path to -rpath.
if _OPTIONS["libdir"] then
linkoptions {"-Wl,-rpath," .. _OPTIONS["libdir"] }
else