From 0b583424b902d1e5a9d67f2dd829f59b5f3e3ba9 Mon Sep 17 00:00:00 2001
From: Matt Madison <matt@madison.systems>
Date: Thu, 1 May 2025 07:02:11 -0700
Subject: [PATCH] gcc-for-nvcc: update DEBUG_PREFIX_MAP

The default prefix map settings have switched to using -ffile-prefix-map,
but the gcc 10 compiler we're building here needs the old -fmacro-prefix-map
and -fdebug-prefix-map settings, so add them back in for these recipes.

Signed-off-by: Matt Madison <matt@madison.systems>
---
 .../gcc-for-nvcc/gcc-for-nvcc-configure-common.inc     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-configure-common.inc b/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-configure-common.inc
index a3ee32f5..95296d22 100644
--- a/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-configure-common.inc
+++ b/recipes-devtools/gcc-for-nvcc/gcc-for-nvcc-configure-common.inc
@@ -2,6 +2,16 @@ require gcc-for-nvcc-multilib-config.inc
 require gcc-for-nvcc-shared-source.inc
 
 DEBUG_PREFIX_MAP:remove:class-target = "-fcanon-prefix-map"
+DEBUG_PREFIX_MAP:append:class-target = "\
+ -fmacro-prefix-map=${S}=${TARGET_DBGSRC_DIR} \
+ -fdebug-prefix-map=${S}=${TARGET_DBGSRC_DIR} \
+ -fmacro-prefix-map=${B}=${TARGET_DBGSRC_DIR} \
+ -fdebug-prefix-map=${B}=${TARGET_DBGSRC_DIR} \
+ -fdebug-prefix-map=${STAGING_DIR_HOST}= \
+ -fmacro-prefix-map=${STAGING_DIR_HOST}= \
+ -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \
+ -fmacro-prefix-map=${STAGING_DIR_NATIVE}= \
+"
 
 #
 # Build the list of lanaguages to build.