diff options
| author |   Ned Deily <nad@python.org> | 2019-04-29 15:11:53 -0400 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2019-04-29 15:11:53 -0400 |
| commit | 9bdd6d1c2a61e0a27dba063e9eccf70e295f73a4 (patch) | |
| tree | 992fb2074ae67711f7d6c4d27c4612c8c6460534 /Mac | |
| parent | bpo-34602: Avoid failures setting macOS stack resource limit (GH-13011) (diff) | |
| download | cpython-9bdd6d1c2a61e0a27dba063e9eccf70e295f73a4.tar.gz cpython-9bdd6d1c2a61e0a27dba063e9eccf70e295f73a4.tar.bz2 cpython-9bdd6d1c2a61e0a27dba063e9eccf70e295f73a4.zip | |
Prevent macOS installer build failure if ABIFLAGS is empty. (GH-13012)
Diffstat (limited to 'Mac')
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 2e3a61ec71d..fb43da5478f 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -1207,7 +1207,8 @@ def buildPython(): if ln.startswith('VERSION='): VERSION=ln.split()[1] if ln.startswith('ABIFLAGS='): - ABIFLAGS=ln.split()[1] + ABIFLAGS=ln.split() + ABIFLAGS=ABIFLAGS[1] if len(ABIFLAGS) > 1 else '' if ln.startswith('LDVERSION='): LDVERSION=ln.split()[1] fp.close() @@ -1258,7 +1259,8 @@ def buildPython(): import pprint if getVersionMajorMinor() >= (3, 6): # XXX this is extra-fragile - path = os.path.join(path_to_lib, '_sysconfigdata_m_darwin_darwin.py') + path = os.path.join(path_to_lib, + '_sysconfigdata_%s_darwin_darwin.py' % (ABIFLAGS,)) else: path = os.path.join(path_to_lib, '_sysconfigdata.py') fp = open(path, 'r') |