From: Ned Deily <nad@python.org>
Date: Mon, 29 Apr 2019 19:11:53 +0000 (-0400)
Subject: Prevent macOS installer build failure if ABIFLAGS is empty. (GH-13012)
X-Git-Tag: v3.8.0a4~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9bdd6d1c2a61e0a27dba063e9eccf70e295f73a4;p=python

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

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 2e3a61ec71..fb43da5478 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')