diff options
| author | Ned Deily <nad@acm.org> | 2012-07-22 07:46:46 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2012-07-22 07:46:46 (GMT) |
| commit | 2c80e120a95e7ce38e65cafc7e1cb2a76046c0e0 (patch) | |
| tree | ad59c0ffae36f0a0e7ab34b8844ea47d8069f104 | |
| parent | 1ef871969cd8b30a8f8d4e6cefab68366eb71745 (diff) | |
| download | cpython-2c80e120a95e7ce38e65cafc7e1cb2a76046c0e0.zip cpython-2c80e120a95e7ce38e65cafc7e1cb2a76046c0e0.tar.gz cpython-2c80e120a95e7ce38e65cafc7e1cb2a76046c0e0.tar.bz2 | |
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.
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 7891b6b..69f9c82 100755 --- 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,), '') - 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() |