Fix bugzilla issue 24669 - Make -i work with C modules (#16776)

opendlang · Sep 20, 2024 · c70dcbc · c70dcbc
1 parent f1171f0
commit c70dcbc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/changelog/dmd.import-c-i.dd b/changelog/dmd.import-c-i.dd
@@ -0,0 +1,3 @@
+Using the compiler flag `-i` will now properly pick up C source files
+
+Previously you needed to manually include .c source files, it now works just like with .d files
diff --git a/compiler/src/dmd/compiler.d b/compiler/src/dmd/compiler.d
@@ -137,7 +137,7 @@ extern (C++) struct Compiler
      */
     extern(C++) static bool onImport(Module m)
     {
-        if (includeImports && m.filetype == FileType.d)
+        if (includeImports && (m.filetype == FileType.d || m.filetype == FileType.c))
         {
             if (includeImportedModuleCheck(ModuleComponentRange(
                 m.md ? m.md.packages : [], m.ident, m.isPackageFile)))

diff --git a/compiler/test/compilable/test16776.d b/compiler/test/compilable/test16776.d
@@ -0,0 +1,8 @@
+// ARG_SETS: -i
+// PERMUTE_ARGS:
+// LINK:
+import imports.cstuff3;
+void main()
+{
+    int s = squared(2);
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Using the compiler flag `-i` will now properly pick up C source files

		Previously you needed to manually include .c source files, it now works just like with .d files