From c294b661266bcf81b16894aa6bff0dafa88d7b86 Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Wed, 14 Jan 2026 13:07:37 +0100 Subject: [PATCH] build: Temporarily remove confusing and brittle -fdebug-prefix-map Github-Pull: #34281 Rebased-From: fa37928536e0048a262260baf998ead026b14bb9 --- CMakeLists.txt | 5 ++--- contrib/guix/libexec/build.sh | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f832625170..3b2e0cd5c2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -484,9 +484,8 @@ try_append_cxx_flags("-fno-extended-identifiers" TARGET core_interface SKIP_LINK # which can cause issues with coverage builds, particularly when using # Clang in the OSS-Fuzz environment due to its use of other options # and a third party script, or with GCC. -try_append_cxx_flags("-fdebug-prefix-map=A=B" TARGET core_interface SKIP_LINK - IF_CHECK_PASSED "-fdebug-prefix-map=${PROJECT_SOURCE_DIR}/src=." -) +# Set `-fmacro-prefix-map`, so that source file names are expanded without the +# src prefix. try_append_cxx_flags("-fmacro-prefix-map=A=B" TARGET core_interface SKIP_LINK IF_CHECK_PASSED "-fmacro-prefix-map=${PROJECT_SOURCE_DIR}/src=." ) diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index f23133fd584..ebfafb75baa 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -211,6 +211,7 @@ CONFIGFLAGS="-DREDUCE_EXPORTS=ON -DBUILD_BENCH=OFF -DBUILD_GUI_TESTS=OFF -DBUILD # CFLAGS HOST_CFLAGS="-O2 -g" HOST_CFLAGS+=$(find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;) +HOST_CFLAGS+=" -fdebug-prefix-map=${DISTSRC}/src=." case "$HOST" in *mingw*) HOST_CFLAGS+=" -fno-ident" ;; *darwin*) unset HOST_CFLAGS ;;