Skip to content

Commit 85224f9

Browse files
committed
Merge bitcoin/bitcoin#30811: build: Unify -logsourcelocations format
788c132 build: Unify `-logsourcelocations` format (Hennadii Stepanov) Pull request description: Closes bitcoin/bitcoin#30799: ``` $ ./build/src/bitcoind -logsourcelocations -asmap=/tmp/no_file 2>&1 | head -1 2024-11-04T11:40:36Z [init/common.cpp:149] [LogPackageVersion] Bitcoin Core version v28.99.0-788c1324f3d8 (release build) ``` ACKs for top commit: maflcko: re-ACK 788c132 fanquake: ACK 788c132 Tree-SHA512: 5e2ac9c3fda148717271c0fa765382cfdfc8e714e5173095ca528ab7026bf0c422222d7da56f55c082c56fc64fd25b5ba71a05e54f6226be327be4598ad9a9f3
2 parents 9719d37 + 788c132 commit 85224f9

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,10 @@ configure_file(contrib/filter-lcov.py filter-lcov.py USE_SOURCE_PERMISSIONS COPY
436436
# Don't allow extended (non-ASCII) symbols in identifiers. This is easier for code review.
437437
try_append_cxx_flags("-fno-extended-identifiers" TARGET core_interface SKIP_LINK)
438438

439+
try_append_cxx_flags("-ffile-prefix-map=A=B" TARGET core_interface SKIP_LINK
440+
IF_CHECK_PASSED "-ffile-prefix-map=${PROJECT_SOURCE_DIR}/src=."
441+
)
442+
439443
# Currently all versions of gcc are subject to a class of bugs, see the
440444
# gccbug_90348 test case (only reproduces on GCC 11 and earlier) and
441445
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111843. To work around that, set

cmake/ccache.cmake

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ if(NOT MSVC)
2323
else()
2424
set(WITH_CCACHE OFF)
2525
endif()
26-
if(WITH_CCACHE)
27-
try_append_cxx_flags("-fdebug-prefix-map=A=B" TARGET core_interface SKIP_LINK
28-
IF_CHECK_PASSED "-fdebug-prefix-map=${PROJECT_SOURCE_DIR}=."
29-
)
30-
try_append_cxx_flags("-fmacro-prefix-map=A=B" TARGET core_interface SKIP_LINK
31-
IF_CHECK_PASSED "-fmacro-prefix-map=${PROJECT_SOURCE_DIR}=."
32-
)
33-
endif()
3426
endif()
3527

3628
mark_as_advanced(CCACHE_EXECUTABLE)

contrib/guix/libexec/build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@ CONFIGFLAGS="-DREDUCE_EXPORTS=ON -DBUILD_BENCH=OFF -DBUILD_GUI_TESTS=OFF -DBUILD
212212
HOST_CFLAGS="-O2 -g"
213213
HOST_CFLAGS+=$(find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;)
214214
case "$HOST" in
215-
*linux*) HOST_CFLAGS+=" -ffile-prefix-map=${DISTSRC}/src=." ;;
216215
*mingw*) HOST_CFLAGS+=" -fno-ident" ;;
217216
*darwin*) unset HOST_CFLAGS ;;
218217
esac

0 commit comments

Comments
 (0)