From ef98d147ddc6a2f0a6d05ff9bb4a6f9c884389e8 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Thu, 5 Sep 2019 16:06:00 +0400 Subject: [PATCH] Link /usr/lib/swift first --- BUCK | 20 ++++++++++++++ Makefile | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 97 insertions(+), 3 deletions(-) diff --git a/BUCK b/BUCK index 53eedeb68c..555f98f385 100644 --- a/BUCK +++ b/BUCK @@ -175,6 +175,10 @@ apple_binary( "-Xlinker", "-rpath", "-Xlinker", + "/usr/lib/swift", + "-Xlinker", + "-rpath", + "-Xlinker", "@executable_path/../../Frameworks", ], deps = [ @@ -214,6 +218,10 @@ apple_binary( "-Xlinker", "-rpath", "-Xlinker", + "/usr/lib/swift", + "-Xlinker", + "-rpath", + "-Xlinker", "@executable_path/../../Frameworks", ], deps = [ @@ -257,6 +265,10 @@ apple_binary( "-Xlinker", "-rpath", "-Xlinker", + "/usr/lib/swift", + "-Xlinker", + "-rpath", + "-Xlinker", "@executable_path/../../Frameworks", ], deps = [ @@ -300,6 +312,10 @@ apple_binary( "-Xlinker", "-rpath", "-Xlinker", + "/usr/lib/swift", + "-Xlinker", + "-rpath", + "-Xlinker", "@executable_path/../../Frameworks", ], deps = [ @@ -340,6 +356,10 @@ apple_binary( "-Xlinker", "-rpath", "-Xlinker", + "/usr/lib/swift", + "-Xlinker", + "-rpath", + "-Xlinker", "@executable_path/../../Frameworks", ], deps = [ diff --git a/Makefile b/Makefile index dd90977465..786164cc33 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY : check_env build build_arm64 package package_arm64 app app_arm64 build_buckdebug build_verbose kill_xcode clean project project_buckdebug temp +.PHONY : check_env build build_arm64 build_debug_arm64 package package_arm64 app app_arm64 app_debug_arm64 build_buckdebug build_verbose kill_xcode clean project project_buckdebug temp BUCK_DEBUG_OPTIONS=\ @@ -95,6 +95,32 @@ build_arm64: check_env //:IntentsExtension#dwarf-and-dsym,iphoneos-arm64 \ ${BUCK_OPTIONS} ${BUCK_RELEASE_OPTIONS} ${BUCK_THREADS_OPTIONS} ${BUCK_CACHE_OPTIONS} +build_debug_arm64: check_env + $(BUCK) build \ + //:AppPackage#iphoneos-arm64 \ + //:Telegram#dwarf-and-dsym,iphoneos-arm64 \ + //submodules/MtProtoKit:MtProtoKit#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/MtProtoKit:MtProtoKit#shared,iphoneos-arm64 \ + //submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared,iphoneos-arm64 \ + //submodules/Postbox:Postbox#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/Postbox:Postbox#shared,iphoneos-arm64 \ + //submodules/TelegramCore:TelegramCore#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/TelegramCore:TelegramCore#shared,iphoneos-arm64 \ + //submodules/AsyncDisplayKit:AsyncDisplayKit#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/AsyncDisplayKit:AsyncDisplayKit#shared,iphoneos-arm64 \ + //submodules/Display:Display#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/Display:Display#shared,iphoneos-arm64 \ + //submodules/TelegramUI:TelegramUI#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/TelegramUI:TelegramUI#shared,iphoneos-arm64 \ + //:WatchAppExtension#dwarf-and-dsym,watchos-arm64_32,watchos-armv7k \ + //:ShareExtension#dwarf-and-dsym,iphoneos-arm64 \ + //:WidgetExtension#dwarf-and-dsym,iphoneos-arm64 \ + //:NotificationContentExtension#dwarf-and-dsym,iphoneos-arm64 \ + //:NotificationServiceExtension#dwarf-and-dsym,iphoneos-arm64 \ + //:IntentsExtension#dwarf-and-dsym,iphoneos-arm64 \ + ${BUCK_OPTIONS} ${BUCK_DEBUG_OPTIONS} ${BUCK_THREADS_OPTIONS} ${BUCK_CACHE_OPTIONS} + build: check_env $(BUCK) build \ //:AppPackage#iphoneos-arm64,iphoneos-armv7 \ @@ -165,11 +191,59 @@ app: build package app_arm64: build_arm64 package_arm64 +app_debug_arm64: build_debug_arm64 package_arm64 + build_buckdebug: check_env - BUCK_DEBUG_MODE=1 $(BUCK) build //submodules/Postbox:Postbox#shared,iphoneos-arm64,iphoneos-armv7 --verbose 7 ${BUCK_OPTIONS} ${BUCK_RELEASE_OPTIONS} + BUCK_DEBUG_MODE=1 $(BUCK) build \ + //:AppPackage#iphoneos-arm64 \ + //:Telegram#dwarf-and-dsym,iphoneos-arm64 \ + //submodules/MtProtoKit:MtProtoKit#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/MtProtoKit:MtProtoKit#shared,iphoneos-arm64 \ + //submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared,iphoneos-arm64 \ + //submodules/Postbox:Postbox#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/Postbox:Postbox#shared,iphoneos-arm64 \ + //submodules/TelegramCore:TelegramCore#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/TelegramCore:TelegramCore#shared,iphoneos-arm64 \ + //submodules/AsyncDisplayKit:AsyncDisplayKit#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/AsyncDisplayKit:AsyncDisplayKit#shared,iphoneos-arm64 \ + //submodules/Display:Display#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/Display:Display#shared,iphoneos-arm64 \ + //submodules/TelegramUI:TelegramUI#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/TelegramUI:TelegramUI#shared,iphoneos-arm64 \ + //:WatchAppExtension#dwarf-and-dsym,watchos-arm64_32,watchos-armv7k \ + //:ShareExtension#dwarf-and-dsym,iphoneos-arm64 \ + //:WidgetExtension#dwarf-and-dsym,iphoneos-arm64 \ + //:NotificationContentExtension#dwarf-and-dsym,iphoneos-arm64 \ + //:NotificationServiceExtension#dwarf-and-dsym,iphoneos-arm64 \ + //:IntentsExtension#dwarf-and-dsym,iphoneos-arm64 \ + --verbose 7 ${BUCK_OPTIONS} ${BUCK_DEBUG_OPTIONS} build_verbose: check_env - $(BUCK) build //submodules/TelegramCore:TelegramCore#shared,iphoneos-arm64,iphoneos-armv7 --verbose 7 ${BUCK_OPTIONS} ${BUCK_THREADS_OPTIONS} ${BUCK_RELEASE_OPTIONS} + $(BUCK) build \ + //:AppPackage#iphoneos-arm64 \ + //:Telegram#dwarf-and-dsym,iphoneos-arm64 \ + //submodules/MtProtoKit:MtProtoKit#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/MtProtoKit:MtProtoKit#shared,iphoneos-arm64 \ + //submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared,iphoneos-arm64 \ + //submodules/Postbox:Postbox#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/Postbox:Postbox#shared,iphoneos-arm64 \ + //submodules/TelegramCore:TelegramCore#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/TelegramCore:TelegramCore#shared,iphoneos-arm64 \ + //submodules/AsyncDisplayKit:AsyncDisplayKit#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/AsyncDisplayKit:AsyncDisplayKit#shared,iphoneos-arm64 \ + //submodules/Display:Display#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/Display:Display#shared,iphoneos-arm64 \ + //submodules/TelegramUI:TelegramUI#dwarf-and-dsym,shared,iphoneos-arm64 \ + //submodules/TelegramUI:TelegramUI#shared,iphoneos-arm64 \ + //:WatchAppExtension#dwarf-and-dsym,watchos-arm64_32,watchos-armv7k \ + //:ShareExtension#dwarf-and-dsym,iphoneos-arm64 \ + //:WidgetExtension#dwarf-and-dsym,iphoneos-arm64 \ + //:NotificationContentExtension#dwarf-and-dsym,iphoneos-arm64 \ + //:NotificationServiceExtension#dwarf-and-dsym,iphoneos-arm64 \ + //:IntentsExtension#dwarf-and-dsym,iphoneos-arm64 \ + --verbose 8 ${BUCK_OPTIONS} ${BUCK_THREADS_OPTIONS} ${BUCK_DEBUG_OPTIONS} kill_xcode: killall Xcode || true