Skip to content

Commit c64b65e

Browse files
[3.12] gh-117752: Autoconf: store all LLVM profile data in the build directory (GH-117790) (#117795)
This prevents spurious 'env changed' and llvm-profdata merge errors. (cherry picked from commit 396b831) Co-authored-by: Erlend E. Aasland <[email protected]>
1 parent 9376a9f commit c64b65e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

configure

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1989,7 +1989,7 @@ case $CC in
19891989
PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
19901990
PGO_PROF_USE_FLAG="-fprofile-instr-use=code.profclangd"
19911991
LLVM_PROF_MERGER="${LLVM_PROFDATA} merge -output=code.profclangd *.profclangr"
1992-
LLVM_PROF_FILE="LLVM_PROFILE_FILE=\"code-%p.profclangr\""
1992+
LLVM_PROF_FILE="LLVM_PROFILE_FILE=\"\$(shell pwd)/code-%p.profclangr\""
19931993
if test $LLVM_PROF_FOUND = not-found
19941994
then
19951995
LLVM_PROF_ERR=yes
@@ -2005,7 +2005,7 @@ case $CC in
20052005
PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
20062006
PGO_PROF_USE_FLAG="-fprofile-instr-use=code.profclangd"
20072007
LLVM_PROF_MERGER="${LLVM_PROFDATA} merge -output=code.profclangd *.profclangr"
2008-
LLVM_PROF_FILE="LLVM_PROFILE_FILE=\"code-%p.profclangr\""
2008+
LLVM_PROF_FILE="LLVM_PROFILE_FILE=\"\$(shell pwd)/code-%p.profclangr\""
20092009
if test "${LLVM_PROF_FOUND}" = "not-found"
20102010
then
20112011
LLVM_PROF_ERR=yes

0 commit comments

Comments
 (0)