Append default file extension for LDMD only

ldc-developers · Mar 3, 2017 · 8c7c732 · 8c7c732
1 parent 5f7ef2d
commit 8c7c732
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/driver/linker.cpp b/driver/linker.cpp
@@ -77,8 +77,10 @@ static std::string getOutputName(bool const sharedLib) {
   }
 
   if (global.params.exefile) {
-    return extension ? FileName::defaultExt(global.params.exefile, extension)
-                     : global.params.exefile;
+    // DMD adds the default extension if there is none
+    return opts::ldmd && extension
+               ? FileName::defaultExt(global.params.exefile, extension)
+               : global.params.exefile;
   }
 
   // Infer output name from first object file.
@@ -837,7 +839,10 @@ int createStaticLibrary() {
   // output filename
   std::string libName;
   if (global.params.libname) { // explicit
-    libName = FileName::defaultExt(global.params.libname, global.lib_ext);
+    // DMD adds the default extension if there is none
+    libName = opts::ldmd
+                  ? FileName::defaultExt(global.params.libname, global.lib_ext)
+                  : global.params.libname;
   } else { // infer from first object file
     libName = global.params.objfiles->dim
                   ? FileName::removeExt((*global.params.objfiles)[0])