From 58695a9d5afb66fed58b868f8f245fec74b4fa21 Mon Sep 17 00:00:00 2001
From: Ali <>
Date: Fri, 7 Apr 2023 18:43:41 +0400
Subject: [PATCH] Try again

---
 .bazelrc                               | 3 +++
 .gitmodules                            | 2 +-
 Telegram/BUILD                         | 4 ++--
 build-system/Make/Make.py              | 2 +-
 build-system/bazel-rules/apple_support | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index f1cda53727..9f455285f7 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -35,3 +35,6 @@ build --spawn_strategy=standalone
 build --strategy=SwiftCompile=standalone
 build --define RULES_SWIFT_BUILD_DUMMY_WORKER=1
 
+build --apple_crosstool_top=@local_config_apple_cc//:toolchain
+build --crosstool_top=@local_config_apple_cc//:toolchain
+build --host_crosstool_top=@local_config_apple_cc//:toolchain
diff --git a/.gitmodules b/.gitmodules
index d4b6047ecd..62be224db0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,7 +10,7 @@ url=https://github.com/ali-fareed/rules_apple.git
 url=https://github.com/bazelbuild/rules_swift.git
 [submodule "build-system/bazel-rules/apple_support"]
 	path = build-system/bazel-rules/apple_support
-	url = https://github.com/bazelbuild/apple_support.git
+url=https://github.com/ali-fareed/apple_support.git
 [submodule "submodules/TgVoip/libtgvoip"]
 	path = submodules/TgVoip/libtgvoip
 	url = https://github.com/telegramdesktop/libtgvoip.git
diff --git a/Telegram/BUILD b/Telegram/BUILD
index cf9d015746..f52f037129 100644
--- a/Telegram/BUILD
+++ b/Telegram/BUILD
@@ -740,7 +740,7 @@ genrule(
     name = "StripWatchosStubBinary",
     cmd_bash =
 """
-    echo 'lipo -remove arm64e -remove arm64 $$1/TelegramWatch.app/_WatchKitStub/WK -output $$1/TelegramWatch.app/_WatchKitStub/WK && lipo -remove arm64e -remove arm64 $$1/TelegramWatch.app/TelegramWatch -output $$1/TelegramWatch.app/TelegramWatch' > $(location StripWatchosStubBinary.sh)
+    echo 'lipo -remove arm64e $$1/TelegramWatch.app/_WatchKitStub/WK -output $$1/TelegramWatch.app/_WatchKitStub/WK && lipo -remove arm64e $$1/TelegramWatch.app/TelegramWatch -output $$1/TelegramWatch.app/TelegramWatch' > $(location StripWatchosStubBinary.sh)
     echo '' >> $(location StripWatchosStubBinary.sh)
 """,
     outs = [
@@ -1970,7 +1970,7 @@ ios_application(
     }),
     watch_application = select({
         ":disableExtensionsSetting": None,
-        "//conditions:default": None,#":TelegramWatchApp",
+        "//conditions:default": ":TelegramWatchApp",
     }) if telegram_enable_watch else None,
     deps = [
         ":Main",
diff --git a/build-system/Make/Make.py b/build-system/Make/Make.py
index 97328b2efc..52767ccc79 100644
--- a/build-system/Make/Make.py
+++ b/build-system/Make/Make.py
@@ -191,7 +191,7 @@ class BazelCommandLine:
                 '--ios_multi_cpus=arm64',
 
                 # Always build universal Watch binaries.
-                '--watchos_cpus=armv7k,arm64_32',
+                '--watchos_cpus=armv7k,arm64_32,arm64',
 
                 # Generate DSYM files when building.
                 '--apple_generate_dsym',
diff --git a/build-system/bazel-rules/apple_support b/build-system/bazel-rules/apple_support
index 7cecc12692..12fc37b370 160000
--- a/build-system/bazel-rules/apple_support
+++ b/build-system/bazel-rules/apple_support
@@ -1 +1 @@
-Subproject commit 7cecc126925fef811c274b10b99329179574f9cb
+Subproject commit 12fc37b370ff460c8712f16eb61a4d1f5abfc565