Merge pull request #53 from KitsunebiGames/link-merge-ex

Add lflags exceptions for exclusiveMerge

Author: MrcSnm

source/redub/buildapi.d

@@ -498,9 +498,9 @@ private auto save(TRange)(TRange input)
 /**
 *   This version is actually faster than the other one
 */
-ref string[] exclusiveMerge(StringRange)(return scope ref string[] a, StringRange b, scope const string[] excludeFromMerge = null)
+ref string[] exclusiveMerge(StringRange)(return scope ref string[] a, StringRange b, scope const string[] excludeFromMerge = null, scope const string[] alwaysKeep = null)
 {
-    import std.algorithm.searching:countUntil;
+    import std.algorithm.searching : countUntil;
     import std.array;
     auto app = appender!(string[]);
     scope(exit)
@@ -511,7 +511,12 @@ ref string[] exclusiveMerge(StringRange)(return scope ref string[] a, StringRang
     {
         if(bV.length == 0) continue;
         if(countUntil(excludeFromMerge, bV) != -1) continue;
-        foreach(aV; a)
+        else if (countUntil(alwaysKeep, bV) != -1)
+        {
+            app ~= bV;
+            continue outer;
+        }
+        else foreach(aV; a)
         {
             if(aV == bV)
                 continue outer;

source/redub/parsers/base.d

@@ -138,7 +138,7 @@ void addFrameworks(ref BuildRequirements req, JSONStringArray frameworks, ParseC
 }
 void addVersions(ref BuildRequirements req, JSONStringArray vers, ParseConfig c){req.cfg.versions.exclusiveMerge(vers);}
 void addDebugVersions(ref BuildRequirements req, JSONStringArray vers, ParseConfig c){req.cfg.debugVersions.exclusiveMerge(vers);}
-void addLinkFlags(ref BuildRequirements req, JSONStringArray lFlags, ParseConfig c){req.cfg.linkFlags.exclusiveMerge(lFlags);}
+void addLinkFlags(ref BuildRequirements req, JSONStringArray lFlags, ParseConfig c){req.cfg.linkFlags.exclusiveMerge(lFlags, null, linkerMergeKeep);}
 void addDflags(ref BuildRequirements req, JSONStringArray dFlags, ParseConfig c){req.cfg.dFlags.exclusiveMerge(dFlags);}
 void addDependency(
     ref BuildRequirements req, 
@@ -214,3 +214,10 @@ void addSubConfiguration(
     else
         req.dependencies[depIndex].subConfiguration = BuildRequirements.Configuration(subConfigurationName, false);
 }
+
+const string[] linkerMergeKeep = [
+    "-l",
+    "-framework",
+    "-L",
+    "/LIBPATH",
+];