diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-03-09 13:12:08 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-03-09 13:12:08 -0230 |
| commit | 24ebd55b303bbd09161085003427db873be12eb5 (patch) | |
| tree | 0630c0ba01a04643f8edad9ad2a16a05f866f471 /demoscript/Util.py | |
| parent | ICE-6342 scripts/TestUtil.py and demoscript/Util.py set java.library.path to ... (diff) | |
| download | ice-24ebd55b303bbd09161085003427db873be12eb5.tar.bz2 ice-24ebd55b303bbd09161085003427db873be12eb5.tar.xz ice-24ebd55b303bbd09161085003427db873be12eb5.zip | |
ICE-6342 forgot to fix demo script
Diffstat (limited to 'demoscript/Util.py')
| -rw-r--r-- | demoscript/Util.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py index bd4e2317f20..aab6cef9f9b 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -798,9 +798,15 @@ def getJavaLibraryPath(): elif thirdPartyHome: return "-Djava.library.path=%s " % os.path.join(thirdPartyHome, "lib") elif isRhel() or isSles(): - return "-Djava.library.path=%s " % ("/usr/lib64" if x64 else "/usr/lib") + libpath = ("/usr/lib64" if x64 else "/usr/lib") + if "LD_LIBRARY_PATH" in os.environ: + libpath = os.environ["LD_LIBRARY_PATH"] + ":" + libpath + return "-Djava.library.path=%s " % libpath elif isUbuntu(): - return "-Djava.library.path=%s " % ("/usr/lib/x86_64-linux-gnu" if x64 else "/usr/lib/i386-linux-gnu") + libpath = ("/usr/lib/x86_64-linux-gnu" if x64 else "/usr/lib/i386-linux-gnu") + if "LD_LIBRARY_PATH" in os.environ: + libpath = os.environ["LD_LIBRARY_PATH"] + ":" + libpath + return "-Djava.library.path=%s " % libpath return None def addLdPath(libpath): |