Skip to content

Commit 8f523f6

Browse files
committed
Update: Fixed include linker flags
1 parent 347f170 commit 8f523f6

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

source/redub/buildapi.d

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import redub.package_searching.api;
88

99

1010
///vX.X.X
11-
enum RedubVersionOnly = "v1.24.18";
11+
enum RedubVersionOnly = "v1.24.19";
1212
///Redub vX.X.X
1313
enum RedubVersionShort = "Redub "~RedubVersionOnly;
1414
///Redub vX.X.X - Description
@@ -403,7 +403,7 @@ struct BuildConfiguration
403403
BuildConfiguration mergeLinkFlags(const ref BuildConfiguration other) const
404404
{
405405
BuildConfiguration ret = clone;
406-
ret.linkFlags.exclusiveMerge(other.linkFlags);
406+
ret.linkFlags.exclusiveMerge(other.linkFlags, null, linkerMergeKeep);
407407
return ret;
408408
}
409409

@@ -510,13 +510,15 @@ ref string[] exclusiveMerge(StringRange)(return scope ref string[] a, StringRang
510510
outer: foreach(bV; save(b))
511511
{
512512
if(bV.length == 0) continue;
513-
if(countUntil(excludeFromMerge, bV) != -1) continue;
514-
else if (countUntil(alwaysKeep, bV) != -1)
513+
if(countUntil(excludeFromMerge, bV) != -1)
514+
continue;
515+
if (countUntil(alwaysKeep, bV) != -1)
515516
{
516517
app ~= bV;
517-
continue outer;
518+
continue;
518519
}
519-
else foreach(aV; a)
520+
521+
foreach(aV; a)
520522
{
521523
if(aV == bV)
522524
continue outer;
@@ -1398,4 +1400,11 @@ private bool matches(string inputName, string toMatch) @nogc nothrow
13981400
return false;
13991401
}
14001402
return true;
1401-
}
1403+
}
1404+
1405+
immutable string[] linkerMergeKeep = [
1406+
"-l",
1407+
"-framework",
1408+
"-L",
1409+
"/LIBPATH",
1410+
];

source/redub/parsers/base.d

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,4 @@ void addSubConfiguration(
213213
req.dependencies~= dependency(dependencyName, null, null, req.name, c.workingDir, BuildRequirements.Configuration(subConfigurationName, false), null, null, false);
214214
else
215215
req.dependencies[depIndex].subConfiguration = BuildRequirements.Configuration(subConfigurationName, false);
216-
}
217-
218-
const string[] linkerMergeKeep = [
219-
"-l",
220-
"-framework",
221-
"-L",
222-
"/LIBPATH",
223-
];
216+
}

0 commit comments

Comments
 (0)