From c5ee3caa807abeb14b586117ce36bc1c2a762390 Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Mon, 12 Sep 2016 01:32:03 +0000 Subject: [PATCH] Issue #28066: Fix include search directory logic for out-of-tree builds --- Misc/NEWS | 3 +++ configure | 2 +- configure.ac | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 73286b7eab6..43f8f25ed51 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -322,6 +322,9 @@ Windows Build ----- +- Issue #28066: Fix the logic that searches build directories for generated + include files when building outside the source tree. + - Issue #27566: Fix clean target in freeze makefile (patch by Lisa Roach) - Issue #27705: Update message in validate_ucrtbase.py diff --git a/configure b/configure index ab1c32acc96..19fcbd128be 100755 --- a/configure +++ b/configure @@ -2820,7 +2820,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 36758d46dd4..381bab05236 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