Merge pull request dlang#458 from CyberShadow/pull-20230430-062515

rdmd: Support -shared in the same way as -lib Signed-off-by: Nicholas Wilson <[email protected]> Merged-on-behalf-of: Vladimir Panteleev <[email protected]>
leh103 · May 1, 2023 · dfe32a6 · dfe32a6
2 parents 02365fa + c950a65
commit dfe32a6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/changelog/rdmd_shared.dd b/changelog/rdmd_shared.dd
@@ -0,0 +1,3 @@
+rdmd supports `-shared`
+
+rdmd now understands DMD's `-shared` switch, and sets the default output file name appropriately (`.dll`, `.so`, or `.dylib` depending on the platform), in the same way as `-lib`.
diff --git a/rdmd.d b/rdmd.d
@@ -27,13 +27,18 @@ version (Posix)
     enum objExt = ".o";
     enum binExt = "";
     enum libExt = ".a";
+    version (OSX)
+        enum dllExt = ".dylib";
+    else
+        enum dllExt = ".so";
     enum altDirSeparator = "";
 }
 else version (Windows)
 {
     enum objExt = ".obj";
     enum binExt = ".exe";
     enum libExt = ".lib";
+    enum dllExt = ".dll";
     enum altDirSeparator = "/";
 }
 else
@@ -242,10 +247,15 @@ int main(string[] args)
 
     bool obj = compilerFlags.canFind("-c");
     bool lib = compilerFlags.canFind("-lib");
-    string outExt = lib ? libExt : obj ? objExt : binExt;
+    bool dll = compilerFlags.canFind("-shared");
+    string outExt =
+        dll ? dllExt :
+        lib ? libExt :
+        obj ? objExt :
+        binExt;
 
-    // Assume --build-only for -c and -lib.
-    buildOnly |= obj || lib;
+    // Assume --build-only for -c / -lib / -shared.
+    buildOnly |= obj || lib || dll;
 
     // --build-only implies the user would like a binary in the program's directory
     if (buildOnly && !exe.ptr)
@@ -360,7 +370,7 @@ size_t indexOfProgram(string[] args)
     {
         auto arg = args[i];
         if (!arg.startsWith('-', '@') &&
-                !arg.endsWith(".obj", ".o", ".lib", ".a", ".def", ".map", ".res") &&
+                !arg.endsWith(".obj", ".o", ".lib", ".a", ".dll", ".so", ".dylib", ".def", ".map", ".res") &&
                 args[i - 1] != "--eval")
         {
             return i;
@@ -627,7 +637,7 @@ private string[string] getDependencies(string rootModule, string workDir,
                 string[] names = [libName ~ ".lib"];
             else
             {
-                string[] names = ["lib" ~ libName ~ ".a", "lib" ~ libName ~ ".so"];
+                string[] names = ["lib" ~ libName ~ ".a", "lib" ~ libName ~ ".so", "lib" ~ libName ~ ".dylib"];
                 dirs ~= ["/lib", "/usr/lib"];
             }
             foreach (dir; dirs)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		rdmd supports `-shared`

		rdmd now understands DMD's `-shared` switch, and sets the default output file name appropriately (`.dll`, `.so`, or `.dylib` depending on the platform), in the same way as `-lib`.