Unverified Kaydet (Commit) 9bdd6d1c authored tarafından Ned Deily's avatar Ned Deily Kaydeden (comit) GitHub

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

üst 883dfc66
...@@ -1207,7 +1207,8 @@ def buildPython(): ...@@ -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(): ...@@ -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')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment