diff --git a/CMakeLists.txt b/CMakeLists.txt index 114d46f71a5..bfcbd69430d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -432,6 +432,10 @@ configure_file(contrib/filter-lcov.py filter-lcov.py USE_SOURCE_PERMISSIONS COPY # Don't allow extended (non-ASCII) symbols in identifiers. This is easier for code review. try_append_cxx_flags("-fno-extended-identifiers" TARGET core_interface SKIP_LINK) +try_append_cxx_flags("-ffile-prefix-map=A=B" TARGET core_interface SKIP_LINK + IF_CHECK_PASSED "-ffile-prefix-map=${PROJECT_SOURCE_DIR}/src=." +) + # Currently all versions of gcc are subject to a class of bugs, see the # gccbug_90348 test case (only reproduces on GCC 11 and earlier) and # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111843. To work around that, set diff --git a/cmake/ccache.cmake b/cmake/ccache.cmake index 099aa66411f..d1cc204c8e4 100644 --- a/cmake/ccache.cmake +++ b/cmake/ccache.cmake @@ -23,14 +23,6 @@ if(NOT MSVC) else() set(WITH_CCACHE OFF) endif() - if(WITH_CCACHE) - try_append_cxx_flags("-fdebug-prefix-map=A=B" TARGET core_interface SKIP_LINK - IF_CHECK_PASSED "-fdebug-prefix-map=${PROJECT_SOURCE_DIR}=." - ) - try_append_cxx_flags("-fmacro-prefix-map=A=B" TARGET core_interface SKIP_LINK - IF_CHECK_PASSED "-fmacro-prefix-map=${PROJECT_SOURCE_DIR}=." - ) - endif() endif() mark_as_advanced(CCACHE_EXECUTABLE) diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 3184cd4afe7..6c252e78702 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -212,7 +212,6 @@ CONFIGFLAGS="-DREDUCE_EXPORTS=ON -DBUILD_BENCH=OFF -DBUILD_GUI_TESTS=OFF -DBUILD HOST_CFLAGS="-O2 -g" HOST_CFLAGS+=$(find /gnu/store -maxdepth 1 -mindepth 1 -type d -exec echo -n " -ffile-prefix-map={}=/usr" \;) case "$HOST" in - *linux*) HOST_CFLAGS+=" -ffile-prefix-map=${DISTSRC}/src=." ;; *mingw*) HOST_CFLAGS+=" -fno-ident" ;; *darwin*) unset HOST_CFLAGS ;; esac