diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-03-20 21:33:00 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-03-20 21:33:00 +0100 |
| commit | 20081357108f41265043496d87a82bfb92585ef0 (patch) | |
| tree | a49900e8e71f745a48af195e202398ed05814cc0 /java/src/ant/SliceTask.java | |
| parent | Fixed bug #2856 (diff) | |
| download | ice-20081357108f41265043496d87a82bfb92585ef0.tar.bz2 ice-20081357108f41265043496d87a82bfb92585ef0.tar.xz ice-20081357108f41265043496d87a82bfb92585ef0.zip | |
Fixed bug 2854 and build system to correctly setup environment when building with 64bits
Diffstat (limited to 'java/src/ant/SliceTask.java')
| -rw-r--r-- | java/src/ant/SliceTask.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/java/src/ant/SliceTask.java b/java/src/ant/SliceTask.java index 48da90adc7b..bf516b237e3 100644 --- a/java/src/ant/SliceTask.java +++ b/java/src/ant/SliceTask.java @@ -375,12 +375,17 @@ public class SliceTask extends org.apache.tools.ant.Task else { ldLibPathEnv = "LD_LIBRARY_PATH"; - ldLib64PathEnv = "LD_LIBRARY_PATH_64"; + ldLib64PathEnv = "LD_LIBRARY_PATH"; lib64Path = new File(iceInstall + File.separator + "lib64").toString(); } if(ldLibPathEnv != null) { + if(ldLibPathEnv.equals(ldLib64PathEnv)) + { + libPath = libPath + File.pathSeparator + lib64Path; + } + String envLibPath = getEnvironment(ldLibPathEnv); if(envLibPath != null) { @@ -393,7 +398,7 @@ public class SliceTask extends org.apache.tools.ant.Task task.addEnv(v); } - if(ldLib64PathEnv != null) + if(ldLib64PathEnv != null && !ldLib64PathEnv.equals(ldLibPathEnv)) { String envLib64Path = getEnvironment(ldLib64PathEnv); if(envLib64Path != null) |