Convert string args to d_import_dirs.

Also update the documentation to reflect the accepted types. Fixes: mesonbuild#12742
amcn · Sep 7, 2024 · 24e3eac · 24e3eac
1 parent 53e1148
commit 24e3eac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/docs/yaml/functions/_build_target_base.yaml b/docs/yaml/functions/_build_target_base.yaml
@@ -256,8 +256,11 @@ kwargs:
       do not support GNU visibility arguments.
 
   d_import_dirs:
-    type: list[str]
-    description: List of directories to look in for string imports used in the D programming language.
+    type: list[inc | str]
+    since: 0.62.0
+    description: |
+      the directories to add to the string search path (i.e. `-J` switch for DMD).
+      Must be [[@inc]] objects or plain strings.
 
   d_unittest:
     type: bool

diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py
@@ -3486,7 +3486,7 @@ def kwarg_strings_to_includedirs(self, kwargs: kwtypes._BuildTarget) -> None:
                         mlog.warning('''Building a path to the source dir is not supported. Use a relative path instead.
 This will become a hard error in the future.''', location=self.current_node)
                         i = os.path.relpath(i, os.path.join(self.environment.get_source_dir(), self.subdir))
-                        i = self.build_incdir_object([i])
+                    i = self.build_incdir_object([i])
                 cleaned_items.append(i)
             kwargs['d_import_dirs'] = cleaned_items