diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-12-03 12:18:34 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-12-03 12:18:34 +0100 |
| commit | e0f99526131e9305583c4525e991f1c965a53c09 (patch) | |
| tree | 9a32c20730888fa28141425f3134aa31d77b504d /demoscript | |
| parent | Fixed issue running icebox from Python demos (diff) | |
| download | ice-e0f99526131e9305583c4525e991f1c965a53c09.tar.bz2 ice-e0f99526131e9305583c4525e991f1c965a53c09.tar.xz ice-e0f99526131e9305583c4525e991f1c965a53c09.zip | |
Fixed ICE-6014: don't prepend /usr/bin to PATH, it break Java1.8 PATH setting
Diffstat (limited to 'demoscript')
| -rw-r--r-- | demoscript/Util.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py index 97b45e1682e..d52c89e8130 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -267,10 +267,12 @@ def configurePaths(): sys.stdout.write("(64bit) ") sys.stdout.write("]\n") + binDir = os.path.join(getIceDir("cpp"), "bin") + # Always add the bin directory to the PATH, it contains executable # which might not be in the compiler/arch bin sub-directory. - binDir = os.path.join(getIceDir("cpp"), "bin") - addenv("PATH", binDir) + if iceHome != "/usr": + addenv("PATH", binDir) if iceHome: |