gcc-for-nvcc: fix DEBUG_PREFIX_MAP handling for the runtime recipes

Like the upstream gcc recipes, we can use the global DEBUG_PREFIX_MAP
setting, but for this older compiler we have to remove '-fcanon-prefix-map'.

Signed-off-by: Matt Madison <matt@madison.systems>
This commit is contained in:
Matt Madison
2024-05-28 06:54:19 -07:00
parent 3c086eca21
commit 3ded37039d
3 changed files with 3 additions and 16 deletions

View File

@@ -1,5 +1,8 @@
require gcc-for-nvcc-multilib-config.inc
require gcc-for-nvcc-shared-source.inc
DEBUG_PREFIX_MAP:remove:class-target = "-fcanon-prefix-map"
#
# Build the list of lanaguages to build.
#

View File

@@ -49,20 +49,6 @@ RUNTIMETARGET:libc-newlib = "libstdc++-v3"
# libiberty
# libgfortran needs separate recipe due to libquadmath dependency
# Relative path to be repaced into debug info
REL_S = "/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
DEBUG_PREFIX_MAP:class-target = " \
-fdebug-prefix-map=${WORKDIR}/${MLPREFIX}recipe-sysroot= \
-fdebug-prefix-map=${WORKDIR}/recipe-sysroot-native= \
-fdebug-prefix-map=${S}=${REL_S} \
-fdebug-prefix-map=${S}/include=${REL_S}/libstdc++-v3/../include \
-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 () {
export CXX="${CXX} -nostdinc++ -L${WORKDIR}/dummylib"
# libstdc++ isn't built yet so CXX would error not able to find it which breaks stdc++'s configure

View File

@@ -4,8 +4,6 @@ require gcc-for-nvcc-configure-common.inc
INHIBIT_DEFAULT_DEPS = "1"
DEBUG_PREFIX_MAP:remove:class-target = "-fcanon-prefix-map"
do_configure () {
install -d ${D}${base_libdir} ${D}${libdir}
mkdir -p ${B}/${BPN}