From 7d08aef9ed34398aedcb0537ed0bbab7cf9e4ae3 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Tue, 14 Jan 2020 20:02:20 -0300 Subject: [PATCH] devenv: Fix path handling for gdb support And enable gdb support only when gdb is avalaible --- gst-env.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gst-env.py b/gst-env.py index 775a41852b..37503c6e31 100755 --- a/gst-env.py +++ b/gst-env.py @@ -137,12 +137,17 @@ def get_wine_subprocess_env(options, env): return env def setup_gdb(options): - bdir = os.path.realpath(options.builddir) python_paths = set() + + if not shutil.which('gdb'): + return python_paths + + bdir = os.path.realpath(options.builddir) for libpath, gdb_path in [ - ("subprojects/gstreamer/gst/", "subprojects/gstreamer/libs/gst/helpers/"), - ("subprojects/glib/gobject", None), - ("subprojects/glib/glib", None)]: + (os.path.join("subprojects", "gstreamer", "gst"), + os.path.join("subprojects", "gstreamer", "libs", "gst", "helpers")), + (os.path.join("subprojects", "glib", "gobject"), None), + (os.path.join("subprojects", "glib", "glib"), None)]: if not gdb_path: gdb_path = libpath