[Python-checkins] Prevent macOS installer build failure if ABIFLAGS is empty. (GH-13012)
Ned Deily
webhook-mailer at python.org
Mon Apr 29 15:11:59 EDT 2019
https://github.com/python/cpython/commit/9bdd6d1c2a61e0a27dba063e9eccf70e295f73a4
commit: 9bdd6d1c2a61e0a27dba063e9eccf70e295f73a4
branch: master
author: Ned Deily <nad at python.org>
committer: GitHub <noreply at github.com>
date: 2019-04-29T15:11:53-04:00
summary:
Prevent macOS installer build failure if ABIFLAGS is empty. (GH-13012)
files:
M Mac/BuildScript/build-installer.py
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 2e3a61ec71d1..fb43da5478f7 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')
More information about the Python-checkins
mailing list