From bb23793da2ff3a0ea5a1ffb8444a626af15162c7 Mon Sep 17 00:00:00 2001 From: Chris Parsons Date: Wed, 28 Oct 2015 21:48:09 +0000 Subject: In objc tools, refer to the realpath tool using its full embedded tool location. Then, if unavailable, look relative to the workspace. -- MOS_MIGRATED_REVID=106536282 --- src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/tools/xcode/swiftstdlibtoolwrapper') diff --git a/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh b/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh index e2fce6e383..90520b5d2b 100755 --- a/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh +++ b/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh @@ -21,7 +21,12 @@ set -eu -OUTZIP=$(tools/objc/realpath "$1") +REALPATH=$0.runfiles/external/bazel_tools/tools/objc/realpath +if [ ! -e $REALPATH ]; then + REALPATH=tools/objc/realpath +fi + +OUTZIP=$($REALPATH "$1") shift 1 TEMPDIR=$(mktemp -d -t swiftstdlibtoolZippingOutput) trap "rm -rf \"$TEMPDIR\"" EXIT -- cgit v1.2.3