From a86c4cb75ffb577922334cf6e212bcd5bac1716d Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@symas.com>
Date: Tue, 3 May 2022 15:51:34 +0100
Subject: Update to MacOSX SDK 11.1, add Mac M1

---
 contrib/gitian/dockrun.sh      | 4 ++--
 contrib/gitian/gitian-build.py | 2 +-
 contrib/gitian/gitian-osx.yml  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'contrib/gitian')

diff --git a/contrib/gitian/dockrun.sh b/contrib/gitian/dockrun.sh
index 015c411fd..ef671116a 100755
--- a/contrib/gitian/dockrun.sh
+++ b/contrib/gitian/dockrun.sh
@@ -53,8 +53,8 @@ docker build --pull -f ${TAG}.Dockerfile -t $TAG .
 
 cd ..
 docker run -v /var/run/docker.sock:/var/run/docker.sock -d --name gitrun $TAG
-if [ -f MacOSX10.11.sdk.tar.gz ]; then
-  docker cp MacOSX10.11.sdk.tar.gz gitrun:$WORKDIR/builder/inputs/
+if [ -f MacOSX11.1.sdk.tar.xz ]; then
+  docker cp MacOSX11.1.sdk.tar.xz gitrun:$WORKDIR/builder/inputs/
 else
   echo "No MacOS SDK found, Mac builds will be omitted"
 fi
diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py
index 6bf936958..1db337e41 100755
--- a/contrib/gitian/gitian-build.py
+++ b/contrib/gitian/gitian-build.py
@@ -162,7 +162,7 @@ def main():
 
     # Disable MacOS build if no SDK found
     args.nomac = False
-    if 'm' in args.os and not os.path.isfile('builder/inputs/MacOSX10.11.sdk.tar.gz'):
+    if 'm' in args.os and not os.path.isfile('builder/inputs/MacOSX11.1.sdk.tar.xz'):
         if args.build:
             print('Cannot build for MacOS, SDK does not exist. Will build for other OSes')
             args.nomac = True
diff --git a/contrib/gitian/gitian-osx.yml b/contrib/gitian/gitian-osx.yml
index 3434861d2..630f7a0d3 100644
--- a/contrib/gitian/gitian-osx.yml
+++ b/contrib/gitian/gitian-osx.yml
@@ -27,10 +27,10 @@ remotes:
 - "url": "https://github.com/monero-project/monero.git"
   "dir": "monero"
 files:
-- "MacOSX10.11.sdk.tar.gz"
+- "MacOSX11.1.sdk.tar.xz"
 script: |
   WRAP_DIR=$HOME/wrapped
-  HOSTS="x86_64-apple-darwin11"
+  HOSTS="x86_64-apple-darwin11 aarch64-apple-darwin11"
   FAKETIME_HOST_PROGS=""
   FAKETIME_PROGS="ar ranlib date dmg genisoimage python"
 
@@ -89,7 +89,7 @@ script: |
   BASEPREFIX=`pwd`/contrib/depends
 
   mkdir -p ${BASEPREFIX}/SDKs
-  tar -C ${BASEPREFIX}/SDKs -xf ${BUILD_DIR}/MacOSX10.11.sdk.tar.gz
+  tar -C ${BASEPREFIX}/SDKs -xf ${BUILD_DIR}/MacOSX11.1.sdk.tar.xz
 
   # Build dependencies for each host
   export TAR_OPTIONS=--mtime=2000-01-01T12:00:00
-- 
cgit v1.2.3