diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-07-30 09:21:53 -0400 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2020-08-18 14:47:38 -0400 |
commit | 1c403e20e70ac523216a31f977901fb815166b7a (patch) | |
tree | 97ea56fc22aa365acb931a7be8c0502890617661 /mesonbuild/dependencies/base.py | |
parent | adfee4460a6a01de975b25e6faf9fd9261238ebd (diff) | |
download | meson-1c403e20e70ac523216a31f977901fb815166b7a.zip meson-1c403e20e70ac523216a31f977901fb815166b7a.tar.gz meson-1c403e20e70ac523216a31f977901fb815166b7a.tar.bz2 |
Interpreter: Fix c_stdlib usage
- Exceptions raised during subproject setup were ignored.
- Allow c_stdlib in native file, was already half supported.
- Eliminate usage of subproject variable name by overriding
'<lang>_stdlib' dependency name.
Diffstat (limited to 'mesonbuild/dependencies/base.py')
-rw-r--r-- | mesonbuild/dependencies/base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index 368a4bc..f581c06 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -2301,7 +2301,7 @@ def get_dep_identifier(name, kwargs) -> T.Tuple: # 'required' is irrelevant for caching; the caller handles it separately # 'fallback' subprojects cannot be cached -- they must be initialized # 'default_options' is only used in fallback case - if key in ('version', 'native', 'required', 'fallback', 'default_options'): + if key in ('version', 'native', 'required', 'fallback', 'default_options', 'force_fallback'): continue # All keyword arguments are strings, ints, or lists (or lists of lists) if isinstance(value, list): |