From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 28 Apr 2021 20:14:40 +0000 (-0700)
Subject: gcc-runtime: Fix __FILE__ related reproducablity issues
X-Git-Tag: uninative-3.1~24
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=972c50d6e46ee9dfba8b8ea3867ebdbf24001e6e;p=openembedded-core.git

gcc-runtime: Fix __FILE__ related reproducablity issues

libstdc++ uses assertion macros which use __FILE__ macros and

  if (__builtin_expect(!bool(_Condition), false))                      \
    std::__replacement_assert(__FILE__, __LINE__, __PRETTY_FUNCTION__, \
                              #_Condition)

This ends up using absolute paths into build tree for the cases where
the charconv header is used, therefore replace the file prefix paths
with on-target paths to make them build dir independent

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 2aca96c408..59d9a24686 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -60,6 +60,7 @@ DEBUG_PREFIX_MAP_class-target = " \
    -fdebug-prefix-map=${S}/libiberty=${REL_S}/libstdc++-v3/../libiberty \
    -fdebug-prefix-map=${S}/libgcc=${REL_S}/libstdc++-v3/../libgcc \
    -fdebug-prefix-map=${B}=${REL_S} \
+   -ffile-prefix-map=${B}/${HOST_SYS}/libstdc++-v3/include=${includedir}/c++/${BINV} \
    "
 
 do_configure () {