aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/BUILD7
-rwxr-xr-xsrc/create_embedded_tools.sh9
-rw-r--r--src/test/shell/bazel/apple/BUILD2
-rw-r--r--src/tools/xcode/actoolwrapper/BUILD2
-rw-r--r--src/tools/xcode/ibtoolwrapper/BUILD2
-rw-r--r--src/tools/xcode/libtool/BUILD23
-rw-r--r--src/tools/xcode/libtool/README9
-rw-r--r--src/tools/xcode/momcwrapper/BUILD2
-rw-r--r--src/tools/xcode/swiftstdlibtoolwrapper/BUILD2
-rw-r--r--src/tools/xcode/xcrunwrapper/BUILD11
-rw-r--r--src/tools/xcode/xcrunwrapper/README7
-rwxr-xr-xtools/objc/libtool.sh (renamed from src/tools/xcode/libtool/libtool.sh)0
-rw-r--r--tools/objc/make_hashed_objlist.py (renamed from src/tools/xcode/libtool/make_hashed_objlist.py)0
-rwxr-xr-xtools/objc/xcrunwrapper.sh (renamed from src/tools/xcode/xcrunwrapper/xcrunwrapper.sh)0
14 files changed, 4 insertions, 72 deletions
diff --git a/src/BUILD b/src/BUILD
index c658107c88..114dcb0639 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -76,12 +76,9 @@ genrule(
OSX_DUMMY_TARGETS = [
"src/tools/xcode/actoolwrapper/actoolwrapper",
"src/tools/xcode/ibtoolwrapper/ibtoolwrapper",
- "src/tools/xcode/libtool/libtool",
- "src/tools/xcode/libtool/make_hashed_objlist.py",
"src/tools/xcode/momcwrapper/momcwrapper",
"src/tools/xcode/swiftstdlibtoolwrapper/swiftstdlibtoolwrapper",
"src/tools/xcode/environment/environment_plist",
- "src/tools/xcode/xcrunwrapper/xcrunwrapper",
"src/objc_tools/bundlemerge/bundlemerge_deploy.jar",
"src/objc_tools/plmerge/plmerge_deploy.jar",
"src/objc_tools/xcodegen/xcodegen_deploy.jar",
@@ -104,11 +101,9 @@ filegroup(
srcs = [
"//src/tools/xcode/actoolwrapper:actoolwrapper",
"//src/tools/xcode/ibtoolwrapper:ibtoolwrapper",
- "//src/tools/xcode/libtool:libtool_srcs",
"//src/tools/xcode/momcwrapper:momcwrapper",
"//src/tools/xcode/swiftstdlibtoolwrapper:swiftstdlibtoolwrapper",
"//src/tools/xcode/environment:environment_plist",
- "//src/tools/xcode/xcrunwrapper:xcrunwrapper",
"//src/objc_tools/bundlemerge:bundlemerge_deploy.jar",
"//src/objc_tools/plmerge:plmerge_deploy.jar",
"//src/objc_tools/xcodegen:xcodegen_deploy.jar",
@@ -356,13 +351,11 @@ filegroup(
"//src/tools/xcode/actoolwrapper:srcs",
"//src/tools/xcode/environment:srcs",
"//src/tools/xcode/ibtoolwrapper:srcs",
- "//src/tools/xcode/libtool:srcs",
"//src/tools/xcode/momcwrapper:srcs",
"//src/tools/xcode/realpath:srcs",
"//src/tools/singlejar:srcs",
"//src/tools/xcode/stdredirect:srcs",
"//src/tools/xcode/swiftstdlibtoolwrapper:srcs",
- "//src/tools/xcode/xcrunwrapper:srcs",
"//src/tools/xcode-common:srcs",
"//src/tools/remote_worker:srcs",
"//tools/osx:srcs",
diff --git a/src/create_embedded_tools.sh b/src/create_embedded_tools.sh
index 0c510ee05b..fdaf0e1c24 100755
--- a/src/create_embedded_tools.sh
+++ b/src/create_embedded_tools.sh
@@ -30,15 +30,6 @@ trap "rm -fr \"${PACKAGE_DIR}\"" EXIT
for i in $*; do
- # 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/make_hashed_objlist.py" ]
- then
- continue
- fi
-
case "$i" in
*tools/jdk/BUILD*) OUTPUT_PATH=tools/jdk/BUILD ;;
*tools/platforms/platforms.BUILD) OUTPUT_PATH=platforms/BUILD ;;
diff --git a/src/test/shell/bazel/apple/BUILD b/src/test/shell/bazel/apple/BUILD
index b550511267..282a5d82be 100644
--- a/src/test/shell/bazel/apple/BUILD
+++ b/src/test/shell/bazel/apple/BUILD
@@ -22,12 +22,10 @@ filegroup(
"//src/tools/xcode/actoolwrapper",
"//src/tools/xcode/environment:environment_plist",
"//src/tools/xcode/ibtoolwrapper",
- "//src/tools/xcode/libtool",
"//src/tools/xcode/momcwrapper",
"//src/tools/xcode/realpath",
"//src/tools/xcode/stdredirect:StdRedirect.dylib",
"//src/tools/xcode/swiftstdlibtoolwrapper",
- "//src/tools/xcode/xcrunwrapper",
"//tools/osx:xcode-locator",
],
"//conditions:default": [],
diff --git a/src/tools/xcode/actoolwrapper/BUILD b/src/tools/xcode/actoolwrapper/BUILD
index 8f717ab9a2..1becfc0f08 100644
--- a/src/tools/xcode/actoolwrapper/BUILD
+++ b/src/tools/xcode/actoolwrapper/BUILD
@@ -10,6 +10,6 @@ sh_binary(
srcs = ["actoolwrapper.sh"],
data = [
"//src/tools/xcode/realpath",
- "//src/tools/xcode/xcrunwrapper",
+ "//tools/objc:xcrunwrapper",
],
)
diff --git a/src/tools/xcode/ibtoolwrapper/BUILD b/src/tools/xcode/ibtoolwrapper/BUILD
index 266b067371..57080e7a78 100644
--- a/src/tools/xcode/ibtoolwrapper/BUILD
+++ b/src/tools/xcode/ibtoolwrapper/BUILD
@@ -10,6 +10,6 @@ sh_binary(
srcs = ["ibtoolwrapper.sh"],
data = [
"//src/tools/xcode/realpath",
- "//src/tools/xcode/xcrunwrapper",
+ "//tools/objc:xcrunwrapper",
],
)
diff --git a/src/tools/xcode/libtool/BUILD b/src/tools/xcode/libtool/BUILD
deleted file mode 100644
index 3aad92a24a..0000000000
--- a/src/tools/xcode/libtool/BUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-package(default_visibility = ["//src:__subpackages__"])
-
-filegroup(
- name = "srcs",
- 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",
- ],
-)
diff --git a/src/tools/xcode/libtool/README b/src/tools/xcode/libtool/README
deleted file mode 100644
index 7b817537fb..0000000000
--- a/src/tools/xcode/libtool/README
+++ /dev/null
@@ -1,9 +0,0 @@
-libtool.sh runs the command passed to it using "xcrun libtool".
-
-It creates symbolic links for all input files with a content-hash appended
-to their original name (foo.o becomes foo_{md5sum}.o). This is to circumvent
-a bug in the original tool that arises when two input files have the same
-base name (even if they are in different directories).
-
-xcrun only runs on Darwin, so libtool.sh only runs on Darwin.
-
diff --git a/src/tools/xcode/momcwrapper/BUILD b/src/tools/xcode/momcwrapper/BUILD
index d75c45d34e..6da07affee 100644
--- a/src/tools/xcode/momcwrapper/BUILD
+++ b/src/tools/xcode/momcwrapper/BUILD
@@ -10,6 +10,6 @@ sh_binary(
srcs = ["momcwrapper.sh"],
data = [
"//src/tools/xcode/realpath",
- "//src/tools/xcode/xcrunwrapper",
+ "//tools/objc:xcrunwrapper",
],
)
diff --git a/src/tools/xcode/swiftstdlibtoolwrapper/BUILD b/src/tools/xcode/swiftstdlibtoolwrapper/BUILD
index a4af5932c8..9407697b9e 100644
--- a/src/tools/xcode/swiftstdlibtoolwrapper/BUILD
+++ b/src/tools/xcode/swiftstdlibtoolwrapper/BUILD
@@ -10,6 +10,6 @@ sh_binary(
srcs = ["swiftstdlibtoolwrapper.sh"],
data = [
"//src/tools/xcode/realpath",
- "//src/tools/xcode/xcrunwrapper",
+ "//tools/objc:xcrunwrapper",
],
)
diff --git a/src/tools/xcode/xcrunwrapper/BUILD b/src/tools/xcode/xcrunwrapper/BUILD
deleted file mode 100644
index e3dbf20a28..0000000000
--- a/src/tools/xcode/xcrunwrapper/BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-package(default_visibility = ["//src:__subpackages__"])
-
-filegroup(
- name = "srcs",
- srcs = glob(["**"]),
-)
-
-sh_binary(
- name = "xcrunwrapper",
- srcs = ["xcrunwrapper.sh"],
-)
diff --git a/src/tools/xcode/xcrunwrapper/README b/src/tools/xcode/xcrunwrapper/README
deleted file mode 100644
index d76642186e..0000000000
--- a/src/tools/xcode/xcrunwrapper/README
+++ /dev/null
@@ -1,7 +0,0 @@
-xcrunwrapper runs the command passed to it using xcrun.
-
-It replaces __DEVELOPER_DIR__ with $DEVELOPER_DIR (or reasonable default)
-and __SDKROOT__ with a valid path based on SDKROOT (or reasonable default).
-
-xcrun only runs on Darwin, so xcrunwrapper only runs on Darwin.
-
diff --git a/src/tools/xcode/libtool/libtool.sh b/tools/objc/libtool.sh
index 5ad89a019d..5ad89a019d 100755
--- a/src/tools/xcode/libtool/libtool.sh
+++ b/tools/objc/libtool.sh
diff --git a/src/tools/xcode/libtool/make_hashed_objlist.py b/tools/objc/make_hashed_objlist.py
index 077d2d12a6..077d2d12a6 100644
--- a/src/tools/xcode/libtool/make_hashed_objlist.py
+++ b/tools/objc/make_hashed_objlist.py
diff --git a/src/tools/xcode/xcrunwrapper/xcrunwrapper.sh b/tools/objc/xcrunwrapper.sh
index 7b27bf5482..7b27bf5482 100755
--- a/src/tools/xcode/xcrunwrapper/xcrunwrapper.sh
+++ b/tools/objc/xcrunwrapper.sh
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-28 06:29:52 +0000