diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2015-02-24 10:56:27 -0330 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2015-02-24 10:56:27 -0330 |
| commit | 72e1cb43106e309e61664b9e22dbe7840c0a1d8d (patch) | |
| tree | 8d90e4f398177c0650f2a752ce05c5bf76ebcd8e /scripts/TestUtil.py | |
| parent | Ubuntu packages minor fixes (diff) | |
| download | ice-72e1cb43106e309e61664b9e22dbe7840c0a1d8d.tar.bz2 ice-72e1cb43106e309e61664b9e22dbe7840c0a1d8d.tar.xz ice-72e1cb43106e309e61664b9e22dbe7840c0a1d8d.zip | |
Fix Ice build to work with our keg only berkeley-db53 formula
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index db843a9c1f3..986b1b7f8ab 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1740,7 +1740,10 @@ def getJavaLibraryPath(): else: return "-Djava.library.path=\"%s\" " % os.path.join(thirdPartyHome, "bin\\x64" if x64 else "bin") elif isDarwin(): - return "-Djava.library.path=%s " % os.path.join("/usr/local/lib") + if os.path.exists('/usr/local/opt/ice/libexec/lib'): + return "-Djava.library.path=/usr/local/opt/ice/libexec/lib " + else: + return "-Djava.library.path=/usr/local/opt/berkeley-db53/lib " elif isRhel() or isSles(): return "-Djava.library.path=%s " % ("/usr/lib64" if x64 else "/usr/lib") elif isUbuntu(): |