From bd2e7cc3af26fdd8bb86009048533e2000c0a490 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Fri, 13 Sep 2019 06:57:45 -0700 Subject: [PATCH] closes bpo-36002: Use AC_PATH_TOOL to find llvm-profdata and llvm-ar. (GH-14998) (cherry picked from commit 0519d497b04b252f50dfff9101fb7f4b9e33f1c4) Co-authored-by: Doyle Rowland --- .../next/Build/2019-09-13-14-12-36.bpo-36002.Bcl4oe.rst | 2 ++ configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Build/2019-09-13-14-12-36.bpo-36002.Bcl4oe.rst diff --git a/Misc/NEWS.d/next/Build/2019-09-13-14-12-36.bpo-36002.Bcl4oe.rst b/Misc/NEWS.d/next/Build/2019-09-13-14-12-36.bpo-36002.Bcl4oe.rst new file mode 100644 index 0000000000..374e7b234c --- /dev/null +++ b/Misc/NEWS.d/next/Build/2019-09-13-14-12-36.bpo-36002.Bcl4oe.rst @@ -0,0 +1,2 @@ +Locate ``llvm-profdata`` and ``llvm-ar`` binaries using ``AC_PATH_TOOL`` +rather than ``AC_PATH_TARGET_TOOL``. diff --git a/configure.ac b/configure.ac index f7e0d80f02..7b3b0b8be4 100644 --- a/configure.ac +++ b/configure.ac @@ -1338,7 +1338,7 @@ if test "$Py_LTO" = 'true' ; then case $CC in *clang*) AC_SUBST(LLVM_AR) - AC_PATH_TARGET_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path}) + AC_PATH_TOOL(LLVM_AR, llvm-ar, '', ${llvm_path}) AC_SUBST(LLVM_AR_FOUND) if test -n "${LLVM_AR}" -a -x "${LLVM_AR}" then @@ -1404,7 +1404,7 @@ AC_SUBST(LLVM_PROF_MERGER) AC_SUBST(LLVM_PROF_FILE) AC_SUBST(LLVM_PROF_ERR) AC_SUBST(LLVM_PROFDATA) -AC_PATH_TARGET_TOOL(LLVM_PROFDATA, llvm-profdata, '', ${llvm_path}) +AC_PATH_TOOL(LLVM_PROFDATA, llvm-profdata, '', ${llvm_path}) AC_SUBST(LLVM_PROF_FOUND) if test -n "${LLVM_PROFDATA}" -a -x "${LLVM_PROFDATA}" then -- 2.50.1