traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #28066: Merge srcdir fix from 3.5

This commit is contained in:
Martin Panter 2016-09-12 01:51:44 +00:00
parent 503ba3ed97 c5ee3caa80
commit 11a86ffe5e
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -872,6 +872,9 @@ C API
Build 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 - Issue #27442: Expose the Android API level that python was built against, in
sysconfig.get_config_vars() as 'ANDROID_API_LEVEL'. sysconfig.get_config_vars() as 'ANDROID_API_LEVEL'.

2
configure vendored
View File

@ -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 # If we're building out-of-tree, we need to make sure the following
# resources get picked up before their $srcdir counterparts. # resources get picked up before their $srcdir counterparts.
# Objects/ -> typeslots.inc # Objects/ -> typeslots.inc

2
configure.ac
View File

@ -10,7 +10,7 @@ AC_PREREQ(2.65)
AC_INIT(python, PYTHON_VERSION, https://bugs.python.org/) AC_INIT(python, PYTHON_VERSION, https://bugs.python.org/)
AC_SUBST(BASECPPFLAGS) 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 # If we're building out-of-tree, we need to make sure the following
# resources get picked up before their $srcdir counterparts. # resources get picked up before their $srcdir counterparts.
# Objects/ -> typeslots.inc # Objects/ -> typeslots.inc