Issue #28066: Fix include search directory logic for out-of-tree builds

diff --git a/Misc/NEWS b/Misc/NEWS
index 73286b7eab6908bd9ad9828ec885806c89653c6a..43f8f25ed5173e6f6c1400bf6fb422aed4fec896 100644 (file)
--- 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 ab1c32acc9659cd1a6f1a1f12b736ace89add2eb..19fcbd128becff127374b3af4dc56f09f1e207a3 100755 (executable)
--- 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 36758d46dd446d85b9ac619c6a3cd50ba4b09709..381bab052365714797d7a7a6ff9425b7a624990b 100644 (file)
--- 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