diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-09-04 09:23:15 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-09-04 09:23:15 -0500 |
| commit | 2acd3cee8c25432e63338fec1251d85aaad3bec4 (patch) | |
| tree | 68b14b3392d428e085505e8035ced71e87756062 /contrib/gitian/gitian-build.py | |
| parent | Merge pull request #5764 (diff) | |
| parent | Gitian build script fixes for MacOS (diff) | |
| download | monero-2acd3cee8c25432e63338fec1251d85aaad3bec4.tar.xz | |
Merge pull request #5796
e3cff3d Gitian build script fixes for MacOS (jonathancross)
Diffstat (limited to 'contrib/gitian/gitian-build.py')
| -rwxr-xr-x | contrib/gitian/gitian-build.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/gitian/gitian-build.py b/contrib/gitian/gitian-build.py index 8c3738591..5913fda3a 100755 --- a/contrib/gitian/gitian-build.py +++ b/contrib/gitian/gitian-build.py @@ -64,7 +64,7 @@ def build(): if args.macos: print('\nCompiling ' + args.version + ' MacOS') - subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'monero='+args.commit, '--url', 'monero'+args.url, '../monero/contrib/gitian/gitian-osx.yml']) + subprocess.check_call(['bin/gbuild', '-j', args.jobs, '-m', args.memory, '--commit', 'monero='+args.commit, '--url', 'monero='+args.url, '../monero/contrib/gitian/gitian-osx.yml']) subprocess.check_call(['bin/gsign', '-p', args.sign_prog, '--signer', args.signer, '--release', args.version+'-osx', '--destination', '../gitian.sigs/', '../monero/contrib/gitian/gitian-osx.yml']) subprocess.check_call('mv build/out/monero*.tar.bz2 ../monero-binaries/'+args.version, shell=True) @@ -141,8 +141,8 @@ def main(): if not 'LXC_GUEST_IP' in os.environ.keys(): os.environ['LXC_GUEST_IP'] = '10.0.3.5' - # Disable for MacOS if no SDK found - if args.macos and not os.path.isfile('gitian-builder/inputs/MacOSX10.11.sdk.tar.gz'): + # Disable MacOS build if no SDK found + if args.build and args.macos and not os.path.isfile('gitian-builder/inputs/MacOSX10.11.sdk.tar.gz'): print('Cannot build for MacOS, SDK does not exist. Will build for other OSes') args.macos = False |