https://github.com/python/cpython/commit/1ddbeae040beb35614f3933f340e0dedcc1e98e4
commit: 1ddbeae040beb35614f3933f340e0dedcc1e98e4
branch: main
author: Erlend E. Aasland <[email protected]>
committer: erlend-aasland <[email protected]>
date: 2024-04-12T09:36:40Z
summary:
gh-117752: Autoconf: fix PGO builds for 'make -C build' incantations (#117803)
files:
M configure
M configure.ac
diff --git a/configure b/configure
index f2e628cee6b2d9..65210e8e0b9ce0 100755
--- a/configure
+++ b/configure
@@ -8826,8 +8826,8 @@ case "$CC_BASENAME" in
*clang*)
# Any changes made here should be reflected in the GCC+Darwin case below
PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
- PGO_PROF_USE_FLAG="-fprofile-instr-use=code.profclangd"
- LLVM_PROF_MERGER="${LLVM_PROFDATA} merge -output=code.profclangd
*.profclangr"
+ PGO_PROF_USE_FLAG="-fprofile-instr-use=\"\$(shell pwd)/code.profclangd\""
+ LLVM_PROF_MERGER=" ${LLVM_PROFDATA} merge -output=\"\$(shell
pwd)/code.profclangd\" \"\$(shell pwd)\"/*.profclangr "
LLVM_PROF_FILE="LLVM_PROFILE_FILE=\"\$(shell pwd)/code-%p.profclangr\""
if test $LLVM_PROF_FOUND = not-found
then
@@ -8842,8 +8842,8 @@ case "$CC_BASENAME" in
case $ac_sys_system in
Darwin*)
PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
- PGO_PROF_USE_FLAG="-fprofile-instr-use=code.profclangd"
- LLVM_PROF_MERGER="${LLVM_PROFDATA} merge -output=code.profclangd
*.profclangr"
+ PGO_PROF_USE_FLAG="-fprofile-instr-use=\"\$(shell
pwd)/code.profclangd\""
+ LLVM_PROF_MERGER=" ${LLVM_PROFDATA} merge -output=\"\$(shell
pwd)/code.profclangd\" \"\$(shell pwd)\"/*.profclangr "
LLVM_PROF_FILE="LLVM_PROFILE_FILE=\"\$(shell pwd)/code-%p.profclangr\""
if test "${LLVM_PROF_FOUND}" = "not-found"
then
diff --git a/configure.ac b/configure.ac
index bcb1169393644b..ece3fe78fcf2a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2011,8 +2011,12 @@ case "$CC_BASENAME" in
*clang*)
# Any changes made here should be reflected in the GCC+Darwin case below
PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
- PGO_PROF_USE_FLAG="-fprofile-instr-use=code.profclangd"
- LLVM_PROF_MERGER="${LLVM_PROFDATA} merge -output=code.profclangd
*.profclangr"
+ PGO_PROF_USE_FLAG="-fprofile-instr-use=\"\$(shell pwd)/code.profclangd\""
+ LLVM_PROF_MERGER=m4_normalize("
+ ${LLVM_PROFDATA} merge
+ -output=\"\$(shell pwd)/code.profclangd\"
+ \"\$(shell pwd)\"/*.profclangr
+ ")
LLVM_PROF_FILE="LLVM_PROFILE_FILE=\"\$(shell pwd)/code-%p.profclangr\""
if test $LLVM_PROF_FOUND = not-found
then
@@ -2027,8 +2031,12 @@ case "$CC_BASENAME" in
case $ac_sys_system in
Darwin*)
PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
- PGO_PROF_USE_FLAG="-fprofile-instr-use=code.profclangd"
- LLVM_PROF_MERGER="${LLVM_PROFDATA} merge -output=code.profclangd
*.profclangr"
+ PGO_PROF_USE_FLAG="-fprofile-instr-use=\"\$(shell
pwd)/code.profclangd\""
+ LLVM_PROF_MERGER=m4_normalize("
+ ${LLVM_PROFDATA} merge
+ -output=\"\$(shell pwd)/code.profclangd\"
+ \"\$(shell pwd)\"/*.profclangr
+ ")
LLVM_PROF_FILE="LLVM_PROFILE_FILE=\"\$(shell pwd)/code-%p.profclangr\""
if test "${LLVM_PROF_FOUND}" = "not-found"
then
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
