devenv: Do not prepend empty list to PATH and LD_LIBRARY_PATH

3 years ago · ac4f8d0088
parent 24f224777d
commit ac4f8d0088
1 changed files with 9 additions and 7 deletions
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@ -1834,11 +1834,13 @@ class Backend:
                # LD_LIBRARY_PATH. This allows running system applications using
                # that library.
                library_paths.add(tdir)
-        if mesonlib.is_windows() or mesonlib.is_cygwin():
-            extra_paths.update(library_paths)
-        elif mesonlib.is_osx():
-            env.prepend('DYLD_LIBRARY_PATH', list(library_paths))
-        else:
-            env.prepend('LD_LIBRARY_PATH', list(library_paths))
-        env.prepend('PATH', list(extra_paths))
+        if library_paths:
+            if mesonlib.is_windows() or mesonlib.is_cygwin():
+                extra_paths.update(library_paths)
+            elif mesonlib.is_osx():
+                env.prepend('DYLD_LIBRARY_PATH', list(library_paths))
+            else:
+                env.prepend('LD_LIBRARY_PATH', list(library_paths))
+        if extra_paths:
+            env.prepend('PATH', list(extra_paths))
        return env