traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent macOS installer build failure if ABIFLAGS is empty. (GH-13012)

This commit is contained in:
Ned Deily 2019-04-29 15:11:53 -04:00 committed by GitHub
parent 883dfc668f
commit 9bdd6d1c2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mac/BuildScript/build-installer.py
View File

@ -1207,7 +1207,8 @@ def buildPython():
if ln.startswith('VERSION='): if ln.startswith('VERSION='):
VERSION=ln.split()[1] VERSION=ln.split()[1]
if ln.startswith('ABIFLAGS='): if ln.startswith('ABIFLAGS='):
ABIFLAGS=ln.split()[1] ABIFLAGS=ln.split()
ABIFLAGS=ABIFLAGS[1] if len(ABIFLAGS) > 1 else ''
if ln.startswith('LDVERSION='): if ln.startswith('LDVERSION='):
LDVERSION=ln.split()[1] LDVERSION=ln.split()[1]
fp.close() fp.close()
@ -1258,7 +1259,8 @@ def buildPython():
import pprint import pprint
if getVersionMajorMinor() >= (3, 6): if getVersionMajorMinor() >= (3, 6):
# XXX this is extra-fragile # 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: else:
path = os.path.join(path_to_lib, '_sysconfigdata.py') path = os.path.join(path_to_lib, '_sysconfigdata.py')
fp = open(path, 'r') fp = open(path, 'r')