Skip to content

Commit e507acb

Browse files
committed
Merge bitcoin#20353: configure: Support -fdebug-prefix-map and -fmacro-prefix-map
7abac98 configure: Support -f{debug,macro}-prefix-map (Anthony Towns) Pull request description: When bitcoin is checked out in two directories (eg via git worktree) object files between the two will differ due to the full path being included in the debug section. `-fdebug-prefix-map` is used to replace this with "." to avoid this unnecessary difference and allow ccache to share objects between worktrees (provided the source and compile options are the same). Also provide `-fmacro-prefix-map` if supported so that the working dir is not encoded in `__FILE__` macros. ACKs for top commit: practicalswift: cr ACK 7abac98: patch looks correct fanquake: ACK 7abac98 Tree-SHA512: b6a37c1728ec3b2e552f244da0e66db113c1e7662c7ac502e12ff466f3dbfbfefae12695ca135137c50dbb1c4c5d84059116c0cd09b391a17466dc77b8726679
2 parents 2bce932 + 7abac98 commit e507acb

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

configure.ac

+4
Original file line numberDiff line numberDiff line change
@@ -1640,6 +1640,10 @@ if test "x$use_ccache" != "xno"; then
16401640
CXX="$ac_cv_path_CCACHE $CXX"
16411641
fi
16421642
AC_MSG_RESULT($use_ccache)
1643+
if test "x$use_ccache" = "xyes"; then
1644+
AX_CHECK_COMPILE_FLAG([-fdebug-prefix-map=A=B],[DEBUG_CXXFLAGS="$DEBUG_CXXFLAGS -fdebug-prefix-map=\$(abs_srcdir)=."],,[[$CXXFLAG_WERROR]])
1645+
AX_CHECK_PREPROC_FLAG([-fmacro-prefix-map=A=B],[DEBUG_CPPFLAGS="$DEBUG_CPPFLAGS -fmacro-prefix-map=\$(abs_srcdir)=."],,[[$CXXFLAG_WERROR]])
1646+
fi
16431647
fi
16441648

16451649
dnl enable wallet

0 commit comments

Comments
 (0)