diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-09-12 01:51:44 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-09-12 01:51:44 (GMT) |
| commit | 11a86ffe5ec975845e9519e27518d0451db37247 (patch) | |
| tree | 8f756357ab36238a7e60300925b4677635bc42a9 | |
| parent | 503ba3ed973d8e82ea5e38cb287d4127fccf51b8 (diff) | |
| parent | c5ee3caa807abeb14b586117ce36bc1c2a762390 (diff) | |
| download | cpython-11a86ffe5ec975845e9519e27518d0451db37247.zip cpython-11a86ffe5ec975845e9519e27518d0451db37247.tar.gz cpython-11a86ffe5ec975845e9519e27518d0451db37247.tar.bz2 | |
Issue #28066: Merge srcdir fix from 3.5
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -872,6 +872,9 @@ C API Build ----- +- Issue #28066: Fix the logic that searches build directories for generated + include files when building outside the source tree. + - Issue #27442: Expose the Android API level that python was built against, in sysconfig.get_config_vars() as 'ANDROID_API_LEVEL'. @@ -2679,7 +2679,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test "$abs_srcdir" != "$abs_builddir"; then +if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then # If we're building out-of-tree, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc diff --git a/configure.ac b/configure.ac index 731b930..01d8d8a 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_PREREQ(2.65) AC_INIT(python, PYTHON_VERSION, https://bugs.python.org/) AC_SUBST(BASECPPFLAGS) -if test "$abs_srcdir" != "$abs_builddir"; then +if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then # If we're building out-of-tree, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc |