diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-05-13 10:36:58 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-06-06 20:02:37 +0000 |
| commit | b7d442150dd8575f0756e3bc9e953d0f198e16c6 (patch) | |
| tree | ea286310111e3e1103db39908cdb8295a3b337f0 /mesonbuild/modules/gnome.py | |
| parent | 58a9555ddf49d851a7eb56874df1d0b3f498e53e (diff) | |
| download | meson-b7d442150dd8575f0756e3bc9e953d0f198e16c6.zip meson-b7d442150dd8575f0756e3bc9e953d0f198e16c6.tar.gz meson-b7d442150dd8575f0756e3bc9e953d0f198e16c6.tar.bz2 | |
Move <lang>_args to coredata.compiler_options
Diffstat (limited to 'mesonbuild/modules/gnome.py')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 0c5da17..436a0e4 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -570,7 +570,7 @@ class GnomeModule(ExtensionModule): ldflags += list(dep_ldflags) scan_command += ['--cflags-begin'] scan_command += cflags - scan_command += state.environment.coredata.external_args[lang] + scan_command += state.environment.coredata.get_external_args(lang) scan_command += ['--cflags-end'] # need to put our output directory first as we need to use the # generated libraries instead of any possibly installed system/prefix @@ -602,7 +602,7 @@ class GnomeModule(ExtensionModule): scan_command.append('-L' + d) scan_command += ['--library', libname] - for link_arg in state.environment.coredata.external_link_args[lang]: + for link_arg in state.environment.coredata.get_external_link_args(lang): if link_arg.startswith('-L'): scan_command.append(link_arg) @@ -838,8 +838,8 @@ This will become a hard error in the future.''') raise MesonException( 'Gir include dirs should be include_directories().') cflags.update(get_include_args(inc_dirs)) - cflags.update(state.environment.coredata.external_args['c']) - ldflags.update(state.environment.coredata.external_link_args['c']) + cflags.update(state.environment.coredata.get_external_args('c')) + ldflags.update(state.environment.coredata.get_external_link_args('c')) if cflags: args += ['--cflags=%s' % ' '.join(cflags)] if ldflags: |