Use gcc-ar instead of ar && consider file extension

D-Programming-GDC · Mar 27, 2016 · c2e6bd7 · c2e6bd7
1 parent 7a4fecb
commit c2e6bd7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/gdmd/app.d b/src/gdmd/app.d
@@ -63,14 +63,16 @@ private:
             arPath = searchAR(entry);
         else
         {
+            auto ext = extension(gdcPath);
             auto idx = gdcPath.lastIndexOf("gdc", std.string.CaseSensitive.no);
-            arPath = gdcPath[0 .. idx] ~ "ar";
+            arPath = gdcPath[0 .. idx] ~ "gcc-ar";
+            arPath = arPath.setExtension(ext);
             // If gdc was found in PATH, search for AR in different PATH directories as well
             if (!arPath.exists() && !args.gdcOption.empty
                     && args.gdcOption.baseName() == args.gdcOption)
             {
                 idx = args.gdcOption.lastIndexOf("gdc", std.string.CaseSensitive.no);
-                arPath = searchAR(args.gdcOption[0 .. idx] ~ "ar");
+                arPath = searchAR((args.gdcOption[0 .. idx] ~ "gcc-ar").setExtension(ext));
             }
         }
     }

diff --git a/src/gdmd/gdc.d b/src/gdmd/gdc.d
@@ -161,7 +161,7 @@ string searchGDC(string entry)
 /// ditto
 string searchAR(string entry)
 {
-    return searchProgram(entry, "ar");
+    return searchProgram(entry, "gcc-ar");
 }
 
 unittest

diff --git a/src/gdmd/response.d b/src/gdmd/response.d
@@ -223,10 +223,6 @@ unittest
         assert(args.length == 2, s ~ " => " ~ q ~ " #" ~ text(args.length - 1));
         assert(args[1] == s, s ~ " => " ~ q ~ " => " ~ args[1]);
     }
-
-    import std.stdio;
-
-    writeln(ArgumentSplitter(`"C:\abc\\"def" foo`));
 }
 
 /**