Skip to content

Commit

Permalink
Merge bitcoin#23317: build: fix python detection post bitcoin#23182
Browse files Browse the repository at this point in the history
a78137e build: fix python detection post bitcoin#23182 (fanquake)

Pull request description:

  bitcoin#23182 was broken. Fixup the changes, and add python3.11 as suggested. Was going to include this in other changes, but no point leaving this broken any longer.

ACKs for top commit:
  MarcoFalke:
    cr ACK a78137e
  hebasto:
    ACK a78137e, tested on Ubuntu Impish 21.10 running `./configure`:

Tree-SHA512: f77cbea76710617eaea85787351a707cc2dcfb7e5962fc6d63ea11e737ee96cb2a496a2a4bb5a147b37ba87b0428977d9295ea053e25417ea13f43137c959919
  • Loading branch information
MarcoFalke committed Oct 20, 2021
2 parents 0ccf9b2 + a78137e commit f9ad4d5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ AC_PATH_TOOL(GCOV, gcov)
AC_PATH_TOOL(LLVM_COV, llvm-cov)
AC_PATH_PROG(LCOV, lcov)
dnl Python 3.6 is specified in .python-version and should be used if available, see doc/dependencies.md
AC_PATH_PROGS([PYTHON], [python3.6 python3.7 python3.8 python3.9, python3.10, python3 python])
AC_PATH_PROGS([PYTHON], [python3.6 python3.7 python3.8 python3.9 python3.10 python3.11 python3 python])
AC_PATH_PROG(GENHTML, genhtml)
AC_PATH_PROG([GIT], [git])
AC_PATH_PROG(CCACHE,ccache)
Expand Down

0 comments on commit f9ad4d5

Please sign in to comment.