Update: Unusing ldc conf parser since it may not be needed if it was only used for web assembly

Author: MrcSnm

source/redub/api.d

@@ -211,9 +211,10 @@ ProjectDetails buildProject(ProjectDetails d)
     ProjectNode tree = d.tree;
     if(d.useExistingObjFiles)
         tree.requirements.cfg.changedBuildFiles = getChangedBuildFiles(tree, session);
-    int uses = tree.isUsingGnuLinker();
-    if(uses != -1)
-        session.compiler.usesGnuLinker = uses ? true : false;
+    ///TODO: Might be reactivated if that issue shows again.
+    // int uses = tree.isUsingGnuLinker();
+    // if(uses != -1)
+    //     session.compiler.usesGnuLinker = uses ? true : false;
     startHandlingConsoleControl();
 
     auto result = timed(()

source/redub/buildapi.d

@@ -8,7 +8,7 @@ import redub.package_searching.api;
 
 
 ///vX.X.X
-enum RedubVersionOnly = "v1.21.5";
+enum RedubVersionOnly = "v1.21.6";
 ///Redub vX.X.X
 enum RedubVersionShort = "Redub "~RedubVersionOnly;
 ///Redub vX.X.X - Description

source/redub/command_generators/linkers.d

@@ -12,6 +12,7 @@ string[] parseLinkConfiguration(const ThreadBuildData data, CompilingSession s,
     string[] commands;
     bool isUsingGNULinker = s.compiler.usesGnuLinker;
 
+
     const BuildConfiguration b = data.cfg;
     with(b)
     {
@@ -40,14 +41,14 @@ string[] parseLinkConfiguration(const ThreadBuildData data, CompilingSession s,
         if (targetType.isLinkedSeparately)
         {
             //Only linux supports start/end group and no-as-needed. OSX does not
-            if(isUsingGNULinker)
+            if(s.isa != ISA.webAssembly)
             {
                 commands~= "-L--no-as-needed";
                 commands~= "-L--start-group";
             }
             ///Use library full path for the base file
             commands = mapAppendReverse(commands, data.extra.librariesFullPath, (string l) => "-L"~getOutputName(TargetType.staticLibrary, l, s.os));
-            if(isUsingGNULinker)
+            if(s.isa != ISA.webAssembly)
                 commands~= "-L--end-group";
             commands = mapAppendPrefix(commands, linkFlags, "-L", false);
             commands = mapAppendPrefix(commands, libraryPaths, "-L-L", true);

source/redub/compiler_identification.d

@@ -58,6 +58,8 @@ struct Compiler
 
     bool usesIncremental = false;
 
+    ///Currently unused. Was used before for checking whether --start-group should be emitted or not. Since it is emitted
+    ///by default, only on webAssembly which is not, it lost its usage for now.
     bool usesGnuLinker = false;
 
 
@@ -218,12 +220,13 @@ Compiler getCompiler(string compilerOrPath = "dmd", string compilerAssumption =
     ret.usesGnuLinker = compilersInfo["defaultsToGnuLd"].boolean;
 
     //Checks for ldc.conf switches to see if it is using gnu linker by default
-    if(ret.compiler == AcceptedCompiler.ldc2)
-    {
-        int res = isUsingGnuLinker(ret.binOrPath, arch);
-        if(res != UsesGnuLinker.unknown)
-            ret.usesGnuLinker = res == UsesGnuLinker.yes ? true : false;
-    } 
+    ///TODO: Might be reactivated if that issue shows again.
+    // if(ret.compiler == AcceptedCompiler.ldc2)
+    // {
+    //     int res = isUsingGnuLinker(ret.binOrPath, arch);
+    //     if(res != UsesGnuLinker.unknown)
+    //         ret.usesGnuLinker = res == UsesGnuLinker.yes ? true : false;
+    // }
 
 
     return ret;
@@ -236,28 +239,28 @@ Compiler getCompiler(string compilerOrPath = "dmd", string compilerAssumption =
  *   arch = Which architecture this compiler run is running with
  * Returns: -1 for can't tell. 0 if false and 1 if true
  */
-private UsesGnuLinker isUsingGnuLinker(string ldcPath, string arch)
-{
-    import redub.misc.ldc_conf_parser;
-    import std.file;
-    import std.algorithm.searching;
-    ConfigSection section = getLdcConfig(std.file.getcwd(), ldcPath, arch);
-    if(section == ConfigSection.init)
-        return UsesGnuLinker.unknown;
-    string* switches = "switches" in section.values;
-    if(!switches)
-        return UsesGnuLinker.unknown;
-    string s = *switches;
-    ptrdiff_t linkerStart = s.countUntil("-link");
-    if(linkerStart == -1)
-        return UsesGnuLinker.unknown;
-    s = s[linkerStart..$];
-
-    if(countUntil(s, "-link-internally") != -1 || countUntil(s, "-linker=lld"))
-        return UsesGnuLinker.no;
-
-    return countUntil(s, "-linker=ld") != -1 ? UsesGnuLinker.yes : UsesGnuLinker.unknown;
-}
+// private UsesGnuLinker isUsingGnuLinker(string ldcPath, string arch)
+// {
+//     import redub.misc.ldc_conf_parser;
+//     import std.file;
+//     import std.algorithm.searching;
+//     ConfigSection section = getLdcConfig(std.file.getcwd(), ldcPath, arch);
+//     if(section == ConfigSection.init)
+//         return UsesGnuLinker.unknown;
+//     string* switches = "switches" in section.values;
+//     if(!switches)
+//         return UsesGnuLinker.unknown;
+//     string s = *switches;
+//     ptrdiff_t linkerStart = s.countUntil("-link");
+//     if(linkerStart == -1)
+//         return UsesGnuLinker.unknown;
+//     s = s[linkerStart..$];
+
+//     if(countUntil(s, "-link-internally") != -1 || countUntil(s, "-linker=lld"))
+//         return UsesGnuLinker.no;
+
+//     return countUntil(s, "-linker=ld") != -1 ? UsesGnuLinker.yes : UsesGnuLinker.unknown;
+// }
 
 
 private Compiler getCompilerFromGlobalPath(string compilerOrPath, JSONValue compilersInfo)

source/redub/misc/ldc_conf_parser.d

@@ -133,7 +133,7 @@ ConfigSection parseLDCConfig(string configText, string confToMatch)
 unittest
 {
     string ldc2example =  q"EOS
-`// See comments in driver/config.d in ldc source tree for grammar description of
+// See comments in driver/config.d in ldc source tree for grammar description of
 // this config file.
 
 // For cross-compilation, you can add sections for specific target triples by