diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-07-20 13:28:03 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-17 19:57:32 +0100 |
commit | 12bdb5df1ebb4e43900f297e0e94b35553a30999 (patch) | |
tree | f10f0672a20621a555996dd6bd59d147c800592c /meta/recipes-devtools/gcc/gcc-runtime.inc | |
parent | 794371ad2da471321bfde494523ee73a10380e0a (diff) | |
download | poky-12bdb5df1ebb4e43900f297e0e94b35553a30999.tar.gz |
bitbake.conf: Handle S and B separately for debug mapping
We don't really need to keep S and B separate for debug source purposes
and there shouldn't be source references in WORKDIR that isn't S and B
either.
Separating these out simplifies the shared-work directory handling for
gcc and should also help fix external source usage. Therefore handle
S and B in DEBUG_PREFIX_MAP separately and clean up other code.
Indentation is reduced here as it is introduced on every compiler
commandline so minimising it is helpful.
(From OE-Core rev: c39b5020b8705d17e3745c41e38d0f99a1ac94cf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-runtime.inc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-runtime.inc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc index 35a3077a4a..fa5b048dab 100644 --- a/meta/recipes-devtools/gcc/gcc-runtime.inc +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc | |||
@@ -50,19 +50,6 @@ RUNTIMETARGET:libc-newlib = "libstdc++-v3" | |||
50 | # libiberty | 50 | # libiberty |
51 | # libgfortran needs separate recipe due to libquadmath dependency | 51 | # libgfortran needs separate recipe due to libquadmath dependency |
52 | 52 | ||
53 | # Relative path to be repaced into debug info | ||
54 | DEBUGSOURCE = "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}" | ||
55 | |||
56 | DEBUG_PREFIX_MAP = " \ | ||
57 | -ffile-prefix-map=${WORKDIR}/${MLPREFIX}recipe-sysroot= \ | ||
58 | -ffile-prefix-map=${WORKDIR}/recipe-sysroot-native= \ | ||
59 | -ffile-prefix-map=${B}=${DEBUGSOURCE} \ | ||
60 | -ffile-prefix-map=${S}=${DEBUGSOURCE} \ | ||
61 | -fdebug-prefix-map=${B}=${DEBUGSOURCE} \ | ||
62 | -fdebug-prefix-map=${S}=${DEBUGSOURCE} \ | ||
63 | -ffile-prefix-map=${B}/${HOST_SYS}/libstdc++-v3/include=${includedir}/c++/${BINV} \ | ||
64 | " | ||
65 | |||
66 | do_configure () { | 53 | do_configure () { |
67 | export CXX="${CXX} -nostdinc++ -L${WORKDIR}/dummylib" | 54 | export CXX="${CXX} -nostdinc++ -L${WORKDIR}/dummylib" |
68 | # libstdc++ isn't built yet so CXX would error not able to find it which breaks stdc++'s configure | 55 | # libstdc++ isn't built yet so CXX would error not able to find it which breaks stdc++'s configure |