diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-06-11 14:32:39 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-06-11 14:32:39 +0530 |
| commit | d38f3deaed52e592d9915e1b7970988ccb28eb7f (patch) | |
| tree | 02b7c7d5d3be243476886513ef10af1dc37f8126 /mesonbuild/interpreter.py | |
| parent | 56462e1439d9dc0730fdb3f2acc619d7c8e484bd (diff) | |
| download | meson-d38f3deaed52e592d9915e1b7970988ccb28eb7f.zip meson-d38f3deaed52e592d9915e1b7970988ccb28eb7f.tar.gz meson-d38f3deaed52e592d9915e1b7970988ccb28eb7f.tar.bz2 | |
gnome: Work around GNU ld bug with -rpath,$ORIGIN
g-ir-scanner doesn't understand -rpath, so we use -L instead which
has the same effect.
Closes https://github.com/mesonbuild/meson/issues/1911
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 621047c..126294f 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1010,10 +1010,9 @@ class CompilerHolder(InterpreterObject): return [] ModuleState = namedtuple('ModuleState', [ - 'build_to_src', 'subdir', 'environment', 'project_name', - 'project_version', 'compilers', 'targets', 'data', 'headers', - 'man', 'global_args', 'project_args', 'build_machine', - 'host_machine', 'target_machine']) + 'build_to_src', 'subdir', 'environment', 'project_name', 'project_version', + 'backend', 'compilers', 'targets', 'data', 'headers', 'man', 'global_args', + 'project_args', 'build_machine', 'host_machine', 'target_machine']) class ModuleHolder(InterpreterObject): def __init__(self, modname, module, interpreter): @@ -1039,6 +1038,9 @@ class ModuleHolder(InterpreterObject): environment=self.interpreter.environment, project_name=self.interpreter.build.project_name, project_version=self.interpreter.build.dep_manifest[self.interpreter.active_projectname], + # The backend object is under-used right now, but we will need it: + # https://github.com/mesonbuild/meson/issues/1419 + backend=self.interpreter.backend, compilers=self.interpreter.build.compilers, targets=self.interpreter.build.targets, data=self.interpreter.build.data, |