From e7b503c436c1f405cbd3d7e7d8e8e0edada8f24f Mon Sep 17 00:00:00 2001
From: amet <amet.nospam@gmail.com>
Date: Thu, 4 Oct 2018 00:19:24 +0400
Subject: [PATCH] fix: xcode 10 has issues with CURRENT_ARCH, we can fix these
 as we only build arm64 and x86_64

---
 tools/darwin/Configurations/App-OSX.xcconfig  | 2 +-
 tools/darwin/Configurations/App-TVOS.xcconfig | 2 +-
 tools/darwin/Configurations/App-iOS.xcconfig  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/darwin/Configurations/App-OSX.xcconfig b/tools/darwin/Configurations/App-OSX.xcconfig
index 360bc6b56a..6b3d76b36b 100644
--- a/tools/darwin/Configurations/App-OSX.xcconfig
+++ b/tools/darwin/Configurations/App-OSX.xcconfig
@@ -30,7 +30,7 @@ INFOPLIST_FILE = $SRCROOT/xbmc/platform/darwin/osx/Info.plist
 ARCHS = i386 x86_64
 ONLY_ACTIVE_ARCH = YES

-XBMC_DEPENDS = $(XBMC_DEPENDS_ROOT)/$(SDK_NAME)_$(CURRENT_ARCH)-target
+XBMC_DEPENDS = $(XBMC_DEPENDS_ROOT)/$(SDK_NAME)_x86_64-target

 OTHER_LDFLAGS = -Wl,-search_paths_first $(APP_OTHER_LDFLAGS_COMMON) -lcdio -lfontconfig -lGLEW

diff --git a/tools/darwin/Configurations/App-TVOS.xcconfig b/tools/darwin/Configurations/App-TVOS.xcconfig
index 72661f55f5..5b26099f84 100644
--- a/tools/darwin/Configurations/App-TVOS.xcconfig
+++ b/tools/darwin/Configurations/App-TVOS.xcconfig
@@ -34,7 +34,7 @@ ARCHS = arm64
 VALID_ARCHS = arm64
 ONLY_ACTIVE_ARCH = YES

-XBMC_DEPENDS = $(XBMC_DEPENDS_ROOT)/$(SDK_NAME)_$(CURRENT_ARCH)-target
+XBMC_DEPENDS = $(XBMC_DEPENDS_ROOT)/$(SDK_NAME)_arm64-target
 INSTALL_PATH = $(HOME)/Library/Bundles

 GCC_INLINES_ARE_PRIVATE_EXTERN = NO
diff --git a/tools/darwin/Configurations/App-iOS.xcconfig b/tools/darwin/Configurations/App-iOS.xcconfig
index fbdaf67dc4..319e67243b 100644
--- a/tools/darwin/Configurations/App-iOS.xcconfig
+++ b/tools/darwin/Configurations/App-iOS.xcconfig
@@ -31,7 +31,7 @@ ARCHS = arm64
 VALID_ARCHS = arm64
 ONLY_ACTIVE_ARCH = YES

-XBMC_DEPENDS = $(XBMC_DEPENDS_ROOT)/$(SDK_NAME)_$(CURRENT_ARCH)-target
+XBMC_DEPENDS = $(XBMC_DEPENDS_ROOT)/$(SDK_NAME)_arm64-target
 INSTALL_PATH = $(HOME)/Library/Bundles

 GCC_INLINES_ARE_PRIVATE_EXTERN = NO