Use runfiles-relative paths for tools/objc shell scripts

--
MOS_MIGRATED_REVID=112478681

4 files changed, 8 insertions, 36 deletions

diff --git a/src/tools/xcode/actoolwrapper/actoolwrapper.sh b/src/tools/xcode/actoolwrapper/actoolwrapper.sh
index 1c3b0ceed3..c0d21979b7 100755
--- a/src/tools/xcode/actoolwrapper/actoolwrapper.sh
+++ b/src/tools/xcode/actoolwrapper/actoolwrapper.sh
@@ -21,10 +21,8 @@
 
 set -eu
 
-REALPATH="$0.runfiles/external/bazel_tools/tools/objc/realpath"
-if [ ! -e $REALPATH ]; then
-  REALPATH=tools/objc/realpath
-fi
+REALPATH=$0.runfiles/external/bazel_tools/tools/objc/realpath
+WRAPPER=$0.runfiles/external/bazel_tools/tools/objc/xcrunwrapper.sh
 
 OUTZIP=$($REALPATH "$1")
 shift 1
@@ -54,11 +52,6 @@ for i in $@; do
   LASTARG="$i"
 done
 
-WRAPPER="$0.runfiles/external/bazel_tools/tools/objc/xcrunwrapper.sh"
-if [ ! -e $WRAPPER ]; then
-  WRAPPER=tools/objc/xcrunwrapper.sh
-fi
-
 # If we are running into problems figuring out actool issues, there are a couple
 # of env variables that may help. Both of the following must be set to work.
 #   IBToolDebugLogFile=<OUTPUT FILE PATH>
diff --git a/src/tools/xcode/ibtoolwrapper/ibtoolwrapper.sh b/src/tools/xcode/ibtoolwrapper/ibtoolwrapper.sh
index f8a807468a..8271399e33 100755
--- a/src/tools/xcode/ibtoolwrapper/ibtoolwrapper.sh
+++ b/src/tools/xcode/ibtoolwrapper/ibtoolwrapper.sh
@@ -25,10 +25,8 @@
 
 set -eu
 
-REALPATH="$0.runfiles/external/bazel_tools/tools/objc/realpath"
-if [ ! -e $REALPATH ]; then
-  REALPATH=tools/objc/realpath
-fi
+REALPATH=$0.runfiles/external/bazel_tools/tools/objc/realpath
+WRAPPER=$0.runfiles/external/bazel_tools/tools/objc/xcrunwrapper.sh
 
 OUTZIP=$($REALPATH "$1")
 ARCHIVEROOT="$2"
@@ -54,11 +52,6 @@ for i in $@; do
   fi
 done
 
-WRAPPER="$0.runfiles/external/bazel_tools/tools/objc/xcrunwrapper.sh"
-if [ ! -e $WRAPPER ]; then
-  WRAPPER=tools/objc/xcrunwrapper.sh
-fi
-
 # If we are running into problems figuring out ibtool issues, there are a couple
 # of env variables that may help. Both of the following must be set to work.
 #   IBToolDebugLogFile=<OUTPUT FILE PATH>
diff --git a/src/tools/xcode/momcwrapper/momcwrapper.sh b/src/tools/xcode/momcwrapper/momcwrapper.sh
index 82a66c8f5c..4387873534 100755
--- a/src/tools/xcode/momcwrapper/momcwrapper.sh
+++ b/src/tools/xcode/momcwrapper/momcwrapper.sh
@@ -22,10 +22,8 @@
 
 set -eu
 
-REALPATH="$0.runfiles/external/bazel_tools/tools/objc/realpath"
-if [ ! -e $REALPATH ]; then
-  REALPATH=tools/objc/realpath
-fi
+REALPATH=$0.runfiles/external/bazel_tools/tools/objc/realpath
+WRAPPER=$0.runfiles/external/bazel_tools/tools/objc/xcrunwrapper.sh
 
 OUTZIP=$($REALPATH "$1")
 NAME="$2"
@@ -33,11 +31,6 @@ shift 2
 TEMPDIR=$(mktemp -d -t momcZippingOutput)
 trap "rm -rf \"$TEMPDIR\"" EXIT
 
-WRAPPER="$0.runfiles/external/bazel_tools/tools/objc/xcrunwrapper.sh"
-if [ ! -e $WRAPPER ]; then
-  WRAPPER=tools/objc/xcrunwrapper.sh
-fi
-
 $WRAPPER momc "$@" "$TEMPDIR/$NAME"
 
 # Need to push/pop tempdir so it isn't the current working directory
diff --git a/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh b/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh
index 24bf573898..86f8b58457 100755
--- a/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh
+++ b/src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper.sh
@@ -21,10 +21,8 @@
 
 set -eu
 
-REALPATH="$0.runfiles/external/bazel_tools/tools/objc/realpath"
-if [ ! -e $REALPATH ]; then
-  REALPATH=tools/objc/realpath
-fi
+REALPATH=$0.runfiles/external/bazel_tools/tools/objc/realpath
+WRAPPER=$0.runfiles/external/bazel_tools/tools/objc/xcrunwrapper.sh
 
 OUTZIP=$($REALPATH "$1")
 shift 1
@@ -33,11 +31,6 @@ trap "rm -rf \"$TEMPDIR\"" EXIT
 
 FULLPATH="$TEMPDIR/Frameworks"
 
-WRAPPER="$0.runfiles/external/bazel_tools/tools/objc/xcrunwrapper.sh"
-if [ ! -e $WRAPPER ]; then
-  WRAPPER=tools/objc/xcrunwrapper.sh
-fi
-
 $WRAPPER swift-stdlib-tool --copy --verbose --destination "$FULLPATH" "$@"
 
 # Need to push/pop tempdir so it isn't the current working directory