Make Mac SDK into a regular depends package

5 files changed, 1 insertions, 35 deletions

diff --git a/contrib/gitian/DOCKRUN.md b/contrib/gitian/DOCKRUN.md
index 7f44b7914..dabf090c2 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 c922a2373..5590acf17 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 ef671116a..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 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
 
 fi
 
diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py
index 1db337e41..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/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
-
     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 630f7a0d3..b4929e822 100644
--- a/contrib/gitian/gitian-osx.yml
+++ b/contrib/gitian/gitian-osx.yml
@@ -26,8 +26,7 @@ packages:
 remotes:
 - "url": "https://github.com/monero-project/monero.git"
   "dir": "monero"
-files:
-- "MacOSX11.1.sdk.tar.xz"
+files: []
 script: |
   WRAP_DIR=$HOME/wrapped
   HOSTS="x86_64-apple-darwin11 aarch64-apple-darwin11"
@@ -88,9 +87,6 @@ script: |
 
   BASEPREFIX=`pwd`/contrib/depends
 
-  mkdir -p ${BASEPREFIX}/SDKs
-  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
   for i in $HOSTS; do