cpython: f4470babf79b (original) (raw)

Mercurial > cpython

changeset 78240:f4470babf79b

Issue #15188: Prevent test_ldshared_value failure due to slightly 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. [#15188]

Ned Deily nad@acm.org
date	Sun, 22 Jul 2012 00:46:46 -0700
parents	31349bc40214
children	c286d50ecd19
files	Mac/BuildScript/build-installer.py
diffstat	1 files changed, 2 insertions(+), 2 deletions(-)[+] [-] Mac/BuildScript/build-installer.py 4

line wrap: on

line diff

--- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -915,8 +915,8 @@ def buildPython(): data = fp.read() fp.close()

   data = data.replace('-L%s/libraries/usr/local/lib'%(WORKDIR,), '')[](#l1.7)

   data = data.replace('-I%s/libraries/usr/local/include'%(WORKDIR,), '')[](#l1.8)

   data = data.replace(' -L%s/libraries/usr/local/lib'%(WORKDIR,), '')[](#l1.9)

   data = data.replace(' -I%s/libraries/usr/local/include'%(WORKDIR,), '')[](#l1.10)
   fp = open(path, 'w')[](#l1.11)
   fp.write(data)[](#l1.12)
   fp.close()[](#l1.13)