Skip to content

Commit ed3b923

Browse files
refi64TingPing
authored andcommitted
Avoid re-processing debug info from previous modules
Fixes #429 Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>
1 parent 60c11d0 commit ed3b923

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/builder-post-process.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,13 +411,15 @@ builder_post_process_debuginfo (GFile *app_dir,
411411
if (is_stripped)
412412
continue;
413413

414-
if (g_str_has_prefix (rel_path_dir, "files/"))
414+
if (g_str_has_prefix (rel_path_dir, "files/")
415+
&& !g_str_has_prefix (rel_path_dir, "files/lib/debug/"))
415416
{
416417
debug_dir = g_build_filename (app_dir_path, "files/lib/debug", rel_path_dir + strlen ("files/"), NULL);
417418
real_debug_dir = g_build_filename ("/app/lib/debug", rel_path_dir + strlen ("files/"), NULL);
418419
source_dir_path = g_build_filename (app_dir_path, "files/lib/debug/source", NULL);
419420
}
420-
else if (g_str_has_prefix (rel_path_dir, "usr/"))
421+
else if (g_str_has_prefix (rel_path_dir, "usr/")
422+
&& !g_str_has_prefix (rel_path_dir, "usr/lib/debug/"))
421423
{
422424
debug_dir = g_build_filename (app_dir_path, "usr/lib/debug", rel_path_dir, NULL);
423425
real_debug_dir = g_build_filename ("/usr/lib/debug", rel_path_dir, NULL);

0 commit comments

Comments
 (0)