summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2017-07-06 15:18:00 -0400
committerJoe George <joe@zeroc.com>2017-07-06 15:19:25 -0400
commitba9a84a3f45e60a10510abe7b551b941bf6e912f (patch)
treeb7810dad547ad3348aee0c04132335f3a6c831d5
parentRemoved trailing whitespace (diff)
downloadice-ba9a84a3f45e60a10510abe7b551b941bf6e912f.tar.bz2
ice-ba9a84a3f45e60a10510abe7b551b941bf6e912f.tar.xz
ice-ba9a84a3f45e60a10510abe7b551b941bf6e912f.zip
Fixes to ice-builder-xcode-wraper
- Use relative path to find Ice home - Ensure ICE_HOME is correctly escaped
-rwxr-xr-xscripts/ice-builder-xcode-wrapper4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/ice-builder-xcode-wrapper b/scripts/ice-builder-xcode-wrapper
index 41e902f0ac1..a7c7b9a5c0e 100755
--- a/scripts/ice-builder-xcode-wrapper
+++ b/scripts/ice-builder-xcode-wrapper
@@ -14,10 +14,10 @@
if [[ "$ICE_BIN_DIST" =~ ^(all|cpp)$ ]]; then
if [ -n "$ICE_HOME" ]; then
- FLAGS="--ice-home $ICE_HOME"
+ FLAGS="--ice-home \"$ICE_HOME\""
fi
else
- FLAGS="--ice-home $(git rev-parse --show-toplevel)"
+ FLAGS="--ice-home ../../../.."
fi
/usr/local/bin/icebuilder $FLAGS "$@"