Merge pull request #8312

5c27fd8 depends: Package cleanup (Howard Chu)
c1d47eb Update randomx: fix Mac linking error (Howard Chu)
02e6af2 Update CI for aarch64 mac build (selsta)
7ea1e21 Make Mac SDK into a regular depends package (Howard Chu)
e81ab9b Silence some protobuf link warnings (Howard Chu)
fe5c2ae Fix arm64 darwin package defs (Howard Chu)
fb68465 Boost 1.64 doesn't recognize arm64 darwin (Howard Chu)
617f908 more... update to clang 9.0.0 (Howard Chu)
83ae3ad Split native_clang out of native_cctools (Howard Chu)
1008318 Update native_cctools for newer SDK support (Howard Chu)
a86c4cb Update to MacOSX SDK 11.1, add Mac M1 (Howard Chu)

5 files changed, 2 insertions, 36 deletions

diff --git a/contrib/gitian/DOCKRUN.md b/contrib/gitian/DOCKRUN.md
index 9a9659473..96998b1fe 100644
--- a/contrib/gitian/DOCKRUN.md
+++ b/contrib/gitian/DOCKRUN.md
@@ -30,12 +30,6 @@ git clone https://github.com/monero-project/monero.git
 cd monero/contrib/gitian
 ```
 
-If you want Mac binaries included in your build, you need to obtain the MacOS SDK:
-
-```bash
-curl -O https://bitcoincore.org/depends-sources/sdks/MacOSX10.11.sdk.tar.gz
-```
-
 Other User Preparation
 ----------------------
 
diff --git a/contrib/gitian/README.md b/contrib/gitian/README.md
index 27f33831f..9852b07ba 100644
--- a/contrib/gitian/README.md
+++ b/contrib/gitian/README.md
@@ -165,15 +165,6 @@ popd
 Build the binaries
 ------------------
 
-**Note:** if you intend to build MacOS binaries, please follow [these instructions](https://github.com/bitcoin-core/docs/blob/master/gitian-building/gitian-building-mac-os-sdk.md) to get the required SDK.
-
-Currently working MacOS solution:
-
-```bash
-curl -O https://bitcoincore.org/depends-sources/sdks/MacOSX10.11.sdk.tar.gz
-mv MacOSX10.11.sdk.tar.gz builder/inputs
-```
-
 To build the most recent tag (pass in `--docker` if using docker):
 
 ```bash
diff --git a/contrib/gitian/dockrun.sh b/contrib/gitian/dockrun.sh
index 015c411fd..396db126b 100755
--- a/contrib/gitian/dockrun.sh
+++ b/contrib/gitian/dockrun.sh
@@ -53,11 +53,6 @@ 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/
-else
-  echo "No MacOS SDK found, Mac builds will be omitted"
-fi
 
 fi
 
diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py
index 6bf936958..859c2c645 100755
--- a/contrib/gitian/gitian-build.py
+++ b/contrib/gitian/gitian-build.py
@@ -59,9 +59,6 @@ def rebuild():
 
 
     for i in args.os:
-        if i is 'm' and args.nomac:
-            continue
-
         os_name = platforms[i][0]
         tag_name = platforms[i][1]
         suffix = platforms[i][2]
@@ -160,13 +157,6 @@ def main():
         if not 'LXC_GUEST_IP' in os.environ.keys():
             os.environ['LXC_GUEST_IP'] = '10.0.2.5'
 
-    # 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 args.build:
-            print('Cannot build for MacOS, SDK does not exist. Will build for other OSes')
-            args.nomac = True
-
     script_name = os.path.basename(sys.argv[0])
     # Signer and version shouldn't be empty
     if args.signer == '':
diff --git a/contrib/gitian/gitian-osx.yml b/contrib/gitian/gitian-osx.yml
index 3434861d2..b4929e822 100644
--- a/contrib/gitian/gitian-osx.yml
+++ b/contrib/gitian/gitian-osx.yml
@@ -26,11 +26,10 @@ packages:
 remotes:
 - "url": "https://github.com/monero-project/monero.git"
   "dir": "monero"
-files:
-- "MacOSX10.11.sdk.tar.gz"
+files: []
 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"
 
@@ -88,9 +87,6 @@ script: |
 
   BASEPREFIX=`pwd`/contrib/depends
 
-  mkdir -p ${BASEPREFIX}/SDKs
-  tar -C ${BASEPREFIX}/SDKs -xf ${BUILD_DIR}/MacOSX10.11.sdk.tar.gz
-
   # Build dependencies for each host
   export TAR_OPTIONS=--mtime=2000-01-01T12:00:00
   for i in $HOSTS; do