diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-01-10 16:25:50 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-01-10 16:25:50 +0100 |
| commit | 91e603c77a0d9498da91dc3e1c57a2d67943d44b (patch) | |
| tree | 2d745ef237dde107e58ba7b1ce9ab7aa0c9d3ed8 /scripts/Util.py | |
| parent | Added back support for new dtags on Linux (diff) | |
| download | ice-91e603c77a0d9498da91dc3e1c57a2d67943d44b.tar.bz2 ice-91e603c77a0d9498da91dc3e1c57a2d67943d44b.tar.xz ice-91e603c77a0d9498da91dc3e1c57a2d67943d44b.zip | |
Added back setting of LD_LIBRARY_PATH for Linux (ICE-7479)
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 2e34bbd78e7..68b55e76da7 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -2477,17 +2477,21 @@ class CppMapping(Mapping): }[plugin] def getEnv(self, process, current): - # # On Windows, add the testcommon directories to the PATH # libPaths = [] if isinstance(platform, Windows): - libPaths.append(self.getLibDir(process, current)) testcommon = os.path.join(self.path, "test", "Common") libPaths.append(os.path.join(testcommon, self.getBuildDir("testcommon", current))) # + # On most platforms, we also need to add the library directory to the library path environment variable. + # + if not isinstance(platform, Darwin): + libPaths.append(self.getLibDir(process, current)) + + # # Add the test suite library directories to the platform library path environment variable. # if current.testcase: |