diff options
Diffstat (limited to 'mesonbuild/scripts')
| -rw-r--r-- | mesonbuild/scripts/gtkdochelper.py | 5 | ||||
| -rw-r--r-- | mesonbuild/scripts/scanbuild.py | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py index 4998e17..ddcc8c0 100644 --- a/mesonbuild/scripts/gtkdochelper.py +++ b/mesonbuild/scripts/gtkdochelper.py @@ -14,10 +14,9 @@ import sys, os import subprocess -import shlex import shutil import argparse -from ..mesonlib import MesonException, Popen_safe, is_windows +from ..mesonlib import MesonException, Popen_safe, is_windows, split_args from . import destdir_join parser = argparse.ArgumentParser() @@ -149,7 +148,7 @@ def build_gtkdoc(source_root, build_root, doc_subdir, src_subdirs, '--output-dir=' + abs_out] library_paths = [] - for ldflag in shlex.split(ldflags): + for ldflag in split_args(ldflags): if ldflag.startswith('-Wl,-rpath,'): library_paths.append(ldflag[11:]) diff --git a/mesonbuild/scripts/scanbuild.py b/mesonbuild/scripts/scanbuild.py index 51f70f0..8c0f423 100644 --- a/mesonbuild/scripts/scanbuild.py +++ b/mesonbuild/scripts/scanbuild.py @@ -13,12 +13,11 @@ # limitations under the License. import os -import shlex import subprocess import shutil import tempfile from ..environment import detect_ninja -from ..mesonlib import Popen_safe +from ..mesonlib import Popen_safe, split_args def scanbuild(exelist, srcdir, blddir, privdir, logdir, args): with tempfile.TemporaryDirectory(dir=privdir) as scandir: @@ -63,7 +62,7 @@ def run(args): break if 'SCANBUILD' in os.environ: - exelist = shlex.split(os.environ['SCANBUILD']) + exelist = split_args(os.environ['SCANBUILD']) else: exelist = [toolname] |