Kaydet (Commit) 13487470 authored tarafından Matthias Klose's avatar Matthias Klose

- Issue #16262: fix out-of-src-tree builds, if mercurial is not installed.

...@@ -308,7 +308,7 @@ AST_ASDL= $(srcdir)/Parser/Python.asdl ...@@ -308,7 +308,7 @@ AST_ASDL= $(srcdir)/Parser/Python.asdl
ASDLGEN_FILES= $(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py ASDLGEN_FILES= $(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py
# XXX Note that a build now requires Python exist before the build starts # XXX Note that a build now requires Python exist before the build starts
ASDLGEN= @DISABLE_ASDLGEN@ $(srcdir)/Parser/asdl_c.py ASDLGEN= @ASDLGEN@ $(srcdir)/Parser/asdl_c.py
########################################################################## ##########################################################################
# Python # Python
......
...@@ -191,6 +191,8 @@ Tests ...@@ -191,6 +191,8 @@ Tests
Build Build
----- -----
- Issue #16262: fix out-of-src-tree builds, if mercurial is not installed.
- Issue #15298: ensure _sysconfigdata is generated in build directory, not - Issue #15298: ensure _sysconfigdata is generated in build directory, not
source directory. source directory.
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
# handle fields that have a type but no name # handle fields that have a type but no name
import os, sys import os, sys
import subprocess
import asdl import asdl
......
This diff is collapsed.
...@@ -1000,12 +1000,12 @@ if test "$cross_compiling" = yes; then ...@@ -1000,12 +1000,12 @@ if test "$cross_compiling" = yes; then
fi fi
AC_SUBST(READELF) AC_SUBST(READELF)
AC_SUBST(DISABLE_ASDLGEN) AC_SUBST(ASDLGEN)
DISABLE_ASDLGEN="" AC_CHECK_PROGS(PYTHON, python$PACKAGE_VERSION python3 python, not-found)
AC_CHECK_PROG(HAS_PYTHON, python, found, not-found) if $PYTHON = not-found; then
if test $HAS_HG != found -o $HAS_PYTHON != found ASDLGEN="@echo python: $PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #"
then else
DISABLE_ASDLGEN="@echo hg: $HAS_HG, python: $HAS_PYTHON! cannot run \$(srcdir)/Parser/asdl_c.py #" ASDLGEN="$PYTHON"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment