[Python-checkins] cpython (2.7): Issue #15819: Drop dead code; -IInclude already added unconditionally
martin.panter
python-checkins at python.org
Tue Sep 13 08:30:16 EDT 2016
https://hg.python.org/cpython/rev/9cabcb4411ac
changeset: 103757:9cabcb4411ac
branch: 2.7
parent: 103747:f30a76f0d477
user: Martin Panter <vadmium+py at gmail.com>
date: Tue Sep 13 11:41:45 2016 +0000
summary:
Issue #15819: Drop dead code; -IInclude already added unconditionally
files:
Misc/NEWS | 3 +++
configure | 15 ---------------
configure.ac | 14 --------------
3 files changed, 3 insertions(+), 29 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -179,6 +179,9 @@
Build
-----
+- Issue #15819: The Include directory in the build tree is already searched;
+ drop unused code trying to add it again.
+
- Issue #27566: Fix clean target in freeze makefile (patch by Lisa Roach)
- Issue #27983: Cause lack of llvm-profdata tool when using clang as
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -687,7 +687,6 @@
HGBRANCH
HGTAG
HGVERSION
-BASECPPFLAGS
SVNVERSION
ARFLAGS
ac_ct_AR
@@ -5748,20 +5747,6 @@
fi
-if test "$abs_srcdir" != "$abs_builddir"; then
- # If we're building out-of-tree make sure Include (in the current dir)
- # gets picked up before its $srcdir counterpart in order for Python-ast.h
- # and graminit.h to get picked up from the correct directory.
- # (A side effect of this is that these resources will automatically be
- # regenerated when building out-of-tree, regardless of whether or not
- # the $srcdir counterpart is up-to-date. This is an acceptable trade
- # off.)
- BASECPPFLAGS="-IInclude"
-else
- BASECPPFLAGS=""
-fi
-
-
# Extract the first word of "hg", so it can be a program name with args.
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -988,20 +988,6 @@
SVNVERSION="echo Unversioned directory"
fi
-AC_SUBST(BASECPPFLAGS)
-if test "$abs_srcdir" != "$abs_builddir"; then
- # If we're building out-of-tree make sure Include (in the current dir)
- # gets picked up before its $srcdir counterpart in order for Python-ast.h
- # and graminit.h to get picked up from the correct directory.
- # (A side effect of this is that these resources will automatically be
- # regenerated when building out-of-tree, regardless of whether or not
- # the $srcdir counterpart is up-to-date. This is an acceptable trade
- # off.)
- BASECPPFLAGS="-IInclude"
-else
- BASECPPFLAGS=""
-fi
-
AC_SUBST(HGVERSION)
AC_SUBST(HGTAG)
AC_SUBST(HGBRANCH)
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list