commit bebbbe5d30f2a05e93780306208e1933d664d71b
author Chris Parsons <cparsons@google.com> Mon Sep 26 20:33:50 2016 +0000
committer John Cater <jcater@google.com> Tue Sep 27 00:11:38 2016 +0000
tree f15f7f8760f16e7bfde98102213ce9a2a3d99eaa
parent f020e6576bffdeffe867b1d4117b17bca4c315d3

Fix dependency on libtool's helper script make_hashed_objlist.py.

This should now get appropriately embedded into @bazel_tools.

--
MOS_MIGRATED_REVID=134319465

src/create_embedded_tools.sh

diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
index 16148e7..26baeb6 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -33,7 +33,8 @@
   # Xcode tools should come from src/tools/xcode/.  Exclude scripts in
   # tools/objc to avoid conflict.
   if  [ "$i" = "tools/objc/xcrunwrapper.sh" ] \
-    || [ "$i" = "tools/objc/libtool.sh" ]
+    || [ "$i" = "tools/objc/libtool.sh" ] \
+    || [ "$i" = "tools/objc/make_hashed_objlist.py" ]
   then
     continue
   fi
@@ -53,8 +54,10 @@
     *zipper) OUTPUT_PATH=tools/zip/zipper/zipper ;;
     *src/objc_tools/*) OUTPUT_PATH=tools/objc/precomp_${i##*/} ;;
     *xcode*StdRedirect.dylib) OUTPUT_PATH=tools/objc/StdRedirect.dylib ;;
+    *xcode*make_hashed_objlist.py) OUTPUT_PATH=tools/objc/make_hashed_objlist.py ;;
     *xcode*realpath) OUTPUT_PATH=tools/objc/realpath ;;
     *xcode*xcode-locator) OUTPUT_PATH=tools/objc/xcode-locator ;;
+    *src/tools/xcode/*.sh) OUTPUT_PATH=tools/objc/${i##*/} ;;
     *src/tools/xcode/*) OUTPUT_PATH=tools/objc/${i##*/}.sh ;;
     *) OUTPUT_PATH=$(echo $i | sed 's_^.*bazel-out/[^/]*/bin/__') ;;
   esac