diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-12-17 12:02:23 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-12-17 12:02:23 +0100 |
| commit | 6892a48667eea4181c63b1d3fc0f0823eda03251 (patch) | |
| tree | 46f91d559af114ff6a686b25c2a5c96890821515 /demoscript/Util.py | |
| parent | Minor testicedist.py fix (diff) | |
| download | ice-6892a48667eea4181c63b1d3fc0f0823eda03251.tar.bz2 ice-6892a48667eea4181c63b1d3fc0f0823eda03251.tar.xz ice-6892a48667eea4181c63b1d3fc0f0823eda03251.zip | |
Fixed ICE-6195 - Util.py fix, added library path for env for interpreters
Diffstat (limited to 'demoscript/Util.py')
| -rw-r--r-- | demoscript/Util.py | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py index 25e9a9689b4..1df801a25ca 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -274,6 +274,7 @@ def configurePaths(): binDir = os.path.join(binDir, "sparcv9") else: binDir = os.path.join(binDir, "amd64") + elif thirdPartyHome: if isWin32(): addenv("PATH", os.path.join(thirdPartyHome, "bin\\x64" if x64 else "bin")) @@ -281,12 +282,24 @@ def configurePaths(): addenv("PATH", os.path.join(thirdPartyHome, "bin\\vc110\\x64" if x64 else "bin\\vc110")) elif isDarwin(): addenv("PATH", os.path.join(thirdPartyHome, "bin")) - else: + elif isWin32() or isDarwin(): print("warning: could not detect Ice Third Party installation") if binDir != os.path.join(getIceDir("cpp"), "bin"): addenv("PATH", binDir) + # + # Setting the library path is necessary for interpreters to find + # the IceSSL library. + # + if not isWin32() and iceHome != "/usr" and getMapping() in ["py", "rb", "php"]: + libDir = os.path.join(getIceDir("cpp"), "lib") + if isUbuntu(): + libDir = os.path.join(libDir, "x86_64-linux-gnu" if x64 else "i386-linux-gnu") + elif x64 and isLinux(): + libDir = libDir + "64" + addLdPath(libDir) + if not iceHome: addenv("PATH", os.path.join(getIceDir("cs"), "bin")) |