fix missing versions with generated source

pull/8229/head
Remi Thebault 4 years ago committed by Dylan Baker
parent 8339594014
commit 25848fc05f
  1. 6
      mesonbuild/compilers/d.py

@ -153,6 +153,9 @@ class DmdLikeCompilerMixin(CompilerMixinBase):
def get_feature_args(self, kwargs: T.Dict[str, T.Any], build_to_src: str) -> T.List[str]: def get_feature_args(self, kwargs: T.Dict[str, T.Any], build_to_src: str) -> T.List[str]:
# TODO: using a TypeDict here would improve this # TODO: using a TypeDict here would improve this
res = [] res = []
# get_feature_args can be called multiple times for the same target when there is generated source
# so we have to copy the kwargs (target.d_features) dict before popping from it
kwargs = kwargs.copy()
if 'unittest' in kwargs: if 'unittest' in kwargs:
unittest = kwargs.pop('unittest') unittest = kwargs.pop('unittest')
unittest_arg = d_feature_args[self.id]['unittest'] unittest_arg = d_feature_args[self.id]['unittest']
@ -527,6 +530,9 @@ class DCompiler(Compiler):
def get_feature_args(self, kwargs: T.Dict[str, T.Any], build_to_src: str) -> T.List[str]: def get_feature_args(self, kwargs: T.Dict[str, T.Any], build_to_src: str) -> T.List[str]:
# TODO: using a TypeDict here would improve this # TODO: using a TypeDict here would improve this
res = [] res = []
# get_feature_args can be called multiple times for the same target when there is generated source
# so we have to copy the kwargs (target.d_features) dict before popping from it
kwargs = kwargs.copy()
if 'unittest' in kwargs: if 'unittest' in kwargs:
unittest = kwargs.pop('unittest') unittest = kwargs.pop('unittest')
unittest_arg = d_feature_args[self.id]['unittest'] unittest_arg = d_feature_args[self.id]['unittest']

Loading…
Cancel
Save