Skip to content

Commit bc73b40

Browse files
committed
Fixed: Problem where empty redub meta would cause bug and compiler identification was wrong
1 parent 1b18ed0 commit bc73b40

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

source/redub/buildapi.d

Lines changed: 1 addition & 1 deletion
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.21.7";
11+
enum RedubVersionOnly = "v1.21.8";
1212
///Redub vX.X.X
1313
enum RedubVersionShort = "Redub "~RedubVersionOnly;
1414
///Redub vX.X.X - Description

source/redub/compiler_identification.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ AcceptedLinker getDefaultLinker()
482482
import std.process;
483483
import std.string;
484484
auto res = executeShell("ld -v");
485-
if(res.status == 0)
485+
if(res.status != 0)
486486
return AcceptedLinker.unknown;
487487

488488
if(res.output.startsWith("GNU ld"))

source/redub/meta.d

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ JSONValue getRedubMeta()
3838
if(exists(metaFile))
3939
{
4040
meta = parseJSON(cast(string)std.file.read(getRedubMetaFileName));
41+
if(meta.hasErrorOccurred)
42+
return JSONValue.emptyObject;
4143
JSONValue* ver = "version" in meta;
4244
if(ver == null || ver.str != RedubVersionOnly)
4345
return JSONValue.emptyObject;

0 commit comments

Comments
 (0)