Fix dependency on libtool's helper script make_hashed_objlist.py.
This should now get appropriately embedded into @bazel_tools.
--
MOS_MIGRATED_REVID=134319465
diff --git a/src/BUILD b/src/BUILD
index af59d9b..c13767d 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -101,7 +101,7 @@
srcs = [
"//src/tools/xcode/actoolwrapper:actoolwrapper",
"//src/tools/xcode/ibtoolwrapper:ibtoolwrapper",
- "//src/tools/xcode/libtool:libtool",
+ "//src/tools/xcode/libtool:libtool_srcs",
"//src/tools/xcode/momcwrapper:momcwrapper",
"//src/tools/xcode/swiftstdlibtoolwrapper:swiftstdlibtoolwrapper",
"//src/tools/xcode/environment:environment_plist",
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
diff --git a/src/tools/xcode/libtool/BUILD b/src/tools/xcode/libtool/BUILD
index 1d7fb58..3aad92a 100644
--- a/src/tools/xcode/libtool/BUILD
+++ b/src/tools/xcode/libtool/BUILD
@@ -5,10 +5,19 @@
srcs = glob(["**"]),
)
+filegroup(
+ name = "libtool_srcs",
+ srcs = [
+ "libtool.sh",
+ "make_hashed_objlist.py",
+ ],
+)
+
sh_binary(
name = "libtool",
srcs = ["libtool.sh"],
data = [
+ ":make_hashed_objlist.py",
"//src/tools/xcode/xcrunwrapper",
],
)