diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-04-17 23:29:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-17 23:29:15 +0300 |
| commit | 1952ef5ae13376084dc277de38ff3a6dafb8e595 (patch) | |
| tree | b0ac33ea58e6ef4d92aca54f21d4c924fd43d821 /mesonbuild/interpreter.py | |
| parent | 8ee1e49ae683cbd7eb10da37327062a490cbee70 (diff) | |
| parent | 1c48cc08e09b1ea860a4972b752d4f053433fa6f (diff) | |
| download | meson-1952ef5ae13376084dc277de38ff3a6dafb8e595.zip meson-1952ef5ae13376084dc277de38ff3a6dafb8e595.tar.gz meson-1952ef5ae13376084dc277de38ff3a6dafb8e595.tar.bz2 | |
Merge pull request #3243 from dcbaker/accept-d-setup
Accept -D for meson level options durring initial configuration
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 4fe879a..4e4ba5c 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2257,10 +2257,12 @@ to directly access options of other subprojects.''') self.coredata.external_args.setdefault(lang, []).append(optvalue) # Otherwise, look for definitions from environment # variables such as CFLAGS. - if not comp.get_language() in self.coredata.external_args: - (preproc_args, compile_args, link_args) = environment.get_args_from_envvars(comp) + (preproc_args, compile_args, link_args) = environment.get_args_from_envvars(comp) + if not comp.get_language() in self.coredata.external_preprocess_args: self.coredata.external_preprocess_args[comp.get_language()] = preproc_args + if not comp.get_language() in self.coredata.external_args: self.coredata.external_args[comp.get_language()] = compile_args + if not comp.get_language() in self.coredata.external_link_args: self.coredata.external_link_args[comp.get_language()] = link_args self.build.add_compiler(comp) if need_cross_compiler: |