diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-01-26 14:02:17 -0500 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2021-01-28 05:12:06 +0000 |
| commit | b58f2798e2bb0c7866455d469dc30f80c2cbd674 (patch) | |
| tree | 9f2acbec0c2c4cddc82af8118ce7e9739fc88b7c | |
| parent | 58c6633d6cde71d8f3ac9f8dd05f97c7ad38b613 (diff) | |
Meson: Do not wrap fccache insallation script
When passing fccache executable directly Meson does special tricks such
as modifying $PATH on Windows.
See: https://github.com/mesonbuild/meson/pull/8259
Fixes: #260
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | fc-cache/meson.build | 2 | ||||
| -rw-r--r-- | install-cache.py | 11 |
3 files changed, 1 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 83db510..e10b710 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,7 +39,6 @@ MESON_FILES = \ doc/run-quiet.py \ fc-case/fc-case.py \ fc-lang/fc-lang.py \ - install-cache.py \ meson.build \ meson_options.txt \ src/cutout.py \ diff --git a/fc-cache/meson.build b/fc-cache/meson.build index 2222735..ed68d1e 100644 --- a/fc-cache/meson.build +++ b/fc-cache/meson.build @@ -9,5 +9,5 @@ tools_man_pages += ['fc-cache'] # Do not try to execute target's fc-cache on host when cross compiling if not meson.is_cross_build() - meson.add_install_script('../install-cache.py', fccache.full_path()) + meson.add_install_script(fccache, '-s', '-f', '-v') endif diff --git a/install-cache.py b/install-cache.py deleted file mode 100644 index 8fa020c..0000000 --- a/install-cache.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python3 - -import sys -import argparse -import subprocess - -if __name__=='__main__': - parser = argparse.ArgumentParser() - parser.add_argument('fccache') - args = parser.parse_args() - sys.exit(subprocess.run([args.fccache, '-s', '-f', '-v']).returncode) |