From 602f6e2c6e64afafd41940e3921c3308b5b51fbf Mon Sep 17 00:00:00 2001
From: altafan <18440657+altafan@users.noreply.github.com>
Date: Wed, 29 Jun 2022 11:50:42 +0200
Subject: [PATCH 1/3] Add virtualenv to requirements

---
 tools/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/requirements.txt b/tools/requirements.txt
index c0a29d93d..a248d32a1 100644
--- a/tools/requirements.txt
+++ b/tools/requirements.txt
@@ -1 +1,2 @@
 meson==0.58.0 --hash=sha256:f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd
+virtualenv==20.15.1

From 7096bba3359f532403cc0c08b3d5659880804f72 Mon Sep 17 00:00:00 2001
From: altafan <18440657+altafan@users.noreply.github.com>
Date: Wed, 29 Jun 2022 11:51:20 +0200
Subject: [PATCH 2/3] Retrieve sdk-path instead of creating it

---
 tools/build.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/build.sh b/tools/build.sh
index d8839d14e..c8da49cf3 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -196,9 +196,7 @@ if [ \( "$(uname)" != "Darwin" \) -a \( "$BUILD" = "--gcc" \) ]; then
 fi
 if [ \( "$BUILD" = "--clang" \) ]; then
     if [ \( "$(uname)" = "Darwin" \) ]; then
-        export XCODE_PATH=$(xcode-select --print-path 2>/dev/null)
-        export PLATFORM="MacOSX"
-        export SDK_PATH="$XCODE_PATH/Platforms/$PLATFORM.platform/Developer/SDKs/$PLATFORM.sdk"
+        export SDK_PATH=$(xcrun --show-sdk-path)
         export SDK_CFLAGS="$SDK_CFLAGS -isysroot ${SDK_PATH} -mmacosx-version-min=10.13"
         export SDK_LDFLAGS="$SDK_LDFLAGS -isysroot ${SDK_PATH} -mmacosx-version-min=10.13"
         export CFLAGS="${SDK_CFLAGS} -O3"

From 91f02b13965e96e43fe1a7fc41bb0b0074506442 Mon Sep 17 00:00:00 2001
From: altafan <18440657+altafan@users.noreply.github.com>
Date: Tue, 5 Jul 2022 01:09:19 +0200
Subject: [PATCH 3/3] Fix path for iphone and simulator

---
 tools/ios_env.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/ios_env.sh b/tools/ios_env.sh
index 8ff42ccf0..e353e709c 100644
--- a/tools/ios_env.sh
+++ b/tools/ios_env.sh
@@ -1,15 +1,13 @@
 if test "x$1" == "x--iphone"; then
     export IOS_PLATFORM=iPhoneOS
     export ARCHS="-arch arm64"
+    export IOS_SDK_PATH=$(xcrun --sdk iphoneos --show-sdk-path)
 else
     export IOS_PLATFORM=iPhoneSimulator
     export ARCHS="-arch x86_64"
+    export IOS_SDK_PATH=$(xcrun --sdk iphonesimulator --show-sdk-path)
 fi
 
-export XCODE_PATH=$(xcode-select --print-path 2>/dev/null)
-export XCODE_DEFAULT_PATH="$XCODE_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin"
-export XCODE_IOS_PATH="$XCODE_PATH/Platforms/$IOS_PLATFORM.platform/Developer/usr/bin"
-export IOS_SDK_PATH="$XCODE_PATH/Platforms/$IOS_PLATFORM.platform/Developer/SDKs/$IOS_PLATFORM.sdk"
 
 export SDK_CFLAGS_NO_ARCH="$q"
 export SDK_CFLAGS="$SDK_CFLAGS $ARCHS"