Skip to content

Commit

Permalink
Fix clang build failure
Browse files Browse the repository at this point in the history
  • Loading branch information
edolstra committed May 31, 2016
1 parent 759ac27 commit 10f3a2e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions release.nix
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ let

doInstallCheck = true;
installCheckFlags = "sysconfdir=$(out)/etc";

stdenv = clangStdenv;
});


Expand Down
3 changes: 2 additions & 1 deletion src/libstore/nar-info.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace nix {

NarInfo::NarInfo(const std::string & s, const std::string & whence)
{
auto corrupt = [&]() [[noreturn]] {
auto corrupt = [&]() {
throw Error("NAR info file ‘%1%’ is corrupt");
};

Expand All @@ -14,6 +14,7 @@ NarInfo::NarInfo(const std::string & s, const std::string & whence)
return parseHash(s);
} catch (BadHash &) {
corrupt();
return Hash(); // never reached
}
};

Expand Down

0 comments on commit 10f3a2e

Please sign in to comment.