aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-03-30 22:09:36 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-03-30 22:09:36 +0300
commit67377e69b5cbf61d557d372b81990d5c0f28b5e3 (patch)
treec2e79a825f7ce427e521f478967a81298c063c37 /mesonbuild/backend
parentc0c9a96c364e9c6f773568645017860ce19ccc0e (diff)
downloadmeson-67377e69b5cbf61d557d372b81990d5c0f28b5e3.zip
meson-67377e69b5cbf61d557d372b81990d5c0f28b5e3.tar.gz
meson-67377e69b5cbf61d557d372b81990d5c0f28b5e3.tar.bz2
Invoke depfixer in-process to make it faster. Closes #480.
Diffstat (limited to 'mesonbuild/backend')
-rw-r--r--mesonbuild/backend/backends.py3
-rw-r--r--mesonbuild/backend/ninjabackend.py3
2 files changed, 2 insertions, 4 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index d352b8b..313580b 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -21,12 +21,11 @@ import subprocess
from ..coredata import MesonException
class InstallData():
- def __init__(self, source_dir, build_dir, prefix, depfixer):
+ def __init__(self, source_dir, build_dir, prefix):
self.source_dir = source_dir
self.build_dir= build_dir
self.prefix = prefix
self.targets = []
- self.depfixer = depfixer
self.headers = []
self.man = []
self.data = []
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 3d83427..3018e38 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -458,10 +458,9 @@ int dummy;
script_root = self.environment.get_script_dir()
install_script = os.path.join(script_root, 'meson_install.py')
install_data_file = os.path.join(self.environment.get_scratch_dir(), 'install.dat')
- depfixer = [sys.executable, self.environment.get_build_command(), '--internal', 'depfixer']
d = InstallData(self.environment.get_source_dir(),
self.environment.get_build_dir(),
- self.environment.get_prefix(), depfixer)
+ self.environment.get_prefix())
elem = NinjaBuildElement(self.all_outputs, 'install', 'CUSTOM_COMMAND', 'PHONY')
elem.add_dep('all')
elem.add_item('DESC', 'Installing files.')