Fix #2698: cImportPaths doesn't work with dmd and ldc

dlang · Feb 6, 2024 · 84510a1 · 84510a1
1 parent 5130176
commit 84510a1
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 2 deletions.
diff --git a/changelog/fix-cimport-paths.dd b/changelog/fix-cimport-paths.dd
@@ -0,0 +1,3 @@
+Fix issue where cImportPaths wasn't working with dmd and ldc
+
+dub was passing -I<import path> instead of -P-I<import path> as is required by those compilers
diff --git a/source/dub/compilers/dmd.d b/source/dub/compilers/dmd.d
@@ -257,7 +257,7 @@ config    /etc/dmd.conf
 		}
 
 		if (!(fields & BuildSetting.cImportPaths)) {
-			settings.addDFlags(settings.cImportPaths.map!(s => "-I"~s)().array());
+			settings.addDFlags(settings.cImportPaths.map!(s => "-P-I"~s)().array());
 			settings.cImportPaths = null;
 		}
 

diff --git a/source/dub/compilers/ldc.d b/source/dub/compilers/ldc.d
@@ -137,7 +137,7 @@ config    /etc/ldc2.conf (x86_64-pc-linux-gnu)
 		}
 
 		if (!(fields & BuildSetting.cImportPaths)) {
-			settings.addDFlags(settings.cImportPaths.map!(s => "-I"~s)().array());
+			settings.addDFlags(settings.cImportPaths.map!(s => "-P-I"~s)().array());
 			settings.cImportPaths = null;
 		}
 

diff --git a/test/issue2698-cimportpaths-broken-with-dmd-ldc/c_headers/foo.h b/test/issue2698-cimportpaths-broken-with-dmd-ldc/c_headers/foo.h
@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+int bar(void)
+{
+	printf("func bar in foo.h\n");
+}
diff --git a/test/issue2698-cimportpaths-broken-with-dmd-ldc/dub.sdl b/test/issue2698-cimportpaths-broken-with-dmd-ldc/dub.sdl
@@ -0,0 +1,5 @@
+name "issue2698-cimportpaths-broken-with-dmd-ldc"
+description "test issue 2698"
+authors "alexander bryan"
+cSourcePaths "source"
+cImportPaths "c_headers"
diff --git a/test/issue2698-cimportpaths-broken-with-dmd-ldc/source/app.d b/test/issue2698-cimportpaths-broken-with-dmd-ldc/source/app.d
@@ -0,0 +1,7 @@
+import std.stdio;
+import foo;
+
+void main()
+{
+	bar();
+}
diff --git a/test/issue2698-cimportpaths-broken-with-dmd-ldc/source/foo.c b/test/issue2698-cimportpaths-broken-with-dmd-ldc/source/foo.c
@@ -0,0 +1 @@
+#include "foo.h"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Fix issue where cImportPaths wasn't working with dmd and ldc

		dub was passing -I<import path> instead of -P-I<import path> as is required by those compilers