]> granicus.if.org Git - python/commitdiff
Prevent macOS installer build failure if ABIFLAGS is empty. (GH-13012)
authorNed Deily <nad@python.org>
Mon, 29 Apr 2019 19:11:53 +0000 (15:11 -0400)
committerGitHub <noreply@github.com>
Mon, 29 Apr 2019 19:11:53 +0000 (15:11 -0400)
Mac/BuildScript/build-installer.py

index 2e3a61ec71d1838182204c3d2e8e62447a588aa7..fb43da5478f72820a8e68d6355c5e0961fda9ab7 100755 (executable)
@@ -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')