]> granicus.if.org Git - python/commitdiff
Issue #15188: Prevent test_ldshared_value failure due to slightly
authorNed Deily <nad@acm.org>
Sun, 22 Jul 2012 07:46:46 +0000 (00:46 -0700)
committerNed Deily <nad@acm.org>
Sun, 22 Jul 2012 07:46:46 +0000 (00:46 -0700)
different parsing of the Makefile by distutils.sysconfig and
sysconfig in the case when an intermediate config vars, used to
construct PY_CFLAGS or PY_LDFLAGS, has a trailing space character.
In this case, the OS X installer build script was leaving a
trailing space in the OPT and LDFLAGS config vars.  The space is not
significant and it's not worth toying with the Makefile parsing.

Mac/BuildScript/build-installer.py

index 7891b6b21edd09256c84fe956f84962de69906a7..69f9c8247e07ea0877310aa37257aa0dcf603940 100755 (executable)
@@ -915,8 +915,8 @@ def buildPython():
         data = fp.read()
         fp.close()
 
-        data = data.replace('-L%s/libraries/usr/local/lib'%(WORKDIR,), '')
-        data = data.replace('-I%s/libraries/usr/local/include'%(WORKDIR,), '')
+        data = data.replace(' -L%s/libraries/usr/local/lib'%(WORKDIR,), '')
+        data = data.replace(' -I%s/libraries/usr/local/include'%(WORKDIR,), '')
         fp = open(path, 'w')
         fp.write(data)
         fp.close()