diff options
| author | Carl Dong <contact@carldong.me> | 2020-06-18 18:05:22 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2020-06-22 10:13:55 -0400 |
| commit | 3381e4a1892511d4d555853887c89badf4c940a9 (patch) | |
| tree | 650accd5e4914cc9b88f93789ca0bf35981d7093 /contrib | |
| parent | b3394ab235b93937321ffd08b8924e57855aac38 (diff) | |
| download | bitcoin-3381e4a1892511d4d555853887c89badf4c940a9.tar.xz | |
Adapt rest of tooling to new SDK naming scheme
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/gitian-build.py | 2 | ||||
| -rw-r--r-- | contrib/gitian-descriptors/gitian-osx.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/gitian-build.py b/contrib/gitian-build.py index 4a3df93cea..48e2a9ec56 100755 --- a/contrib/gitian-build.py +++ b/contrib/gitian-build.py @@ -209,7 +209,7 @@ def main(): args.macos = 'm' in args.os # Disable for MacOS if no SDK found - if args.macos and not os.path.isfile('gitian-builder/inputs/MacOSX10.14.sdk.tar.gz'): + if args.macos and not os.path.isfile('gitian-builder/inputs/Xcode-10.2.1-10E1001-extracted-SDK-with-libcxx-headers.tar.gz'): print('Cannot build for MacOS, SDK does not exist. Will build for other OSes') args.macos = False diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index bbae7201e5..756b5fd7cc 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -32,7 +32,7 @@ remotes: - "url": "https://github.com/bitcoin/bitcoin.git" "dir": "bitcoin" files: -- "MacOSX10.14.sdk.tar.gz" +- "Xcode-10.2.1-10E1001-extracted-SDK-with-libcxx-headers.tar.gz" script: | set -e -o pipefail @@ -90,7 +90,7 @@ script: | BASEPREFIX="${PWD}/depends" mkdir -p ${BASEPREFIX}/SDKs - tar -C ${BASEPREFIX}/SDKs -xf ${BUILD_DIR}/MacOSX10.14.sdk.tar.gz + tar -C ${BASEPREFIX}/SDKs -xf ${BUILD_DIR}/Xcode-10.2.1-10E1001-extracted-SDK-with-libcxx-headers.tar.gz # Build dependencies for each host for i in $HOSTS; do |