diff options
| author | Howard Chu <hyc@symas.com> | 2022-05-03 15:51:34 +0100 |
|---|---|---|
| committer | Howard Chu <hyc@symas.com> | 2022-05-04 22:33:40 +0100 |
| commit | a86c4cb75ffb577922334cf6e212bcd5bac1716d (patch) | |
| tree | f520bee7427d827cc69330bf1b4477b1b57cc8a3 /contrib/gitian | |
| parent | 67e5ca9ad6f1c861ad315476a88f9d36c38a0abb (diff) | |
| download | monzero-core-a86c4cb75ffb577922334cf6e212bcd5bac1716d.tar.gz monzero-core-a86c4cb75ffb577922334cf6e212bcd5bac1716d.tar.xz monzero-core-a86c4cb75ffb577922334cf6e212bcd5bac1716d.zip | |
Update to MacOSX SDK 11.1, add Mac M1
Diffstat (limited to 'contrib/gitian')
| -rwxr-xr-x | contrib/gitian/dockrun.sh | 4 | ||||
| -rwxr-xr-x | contrib/gitian/gitian-build.py | 2 | ||||
| -rw-r--r-- | contrib/gitian/gitian-osx.yml | 6 |
3 files changed, 6 insertions, 6 deletions
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 |