about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-05-31T11·23+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-05-31T11·23+0200
commit10f3a2e5f213df4a1d50947066613bf87a5a1008 (patch)
tree6dc215e59bb466a694e91dd3a45034590c7a2b4a
parent759ac27f282182075047887dd7574749eea2488a (diff)
Fix clang build failure
Apparently opinion is divided on whether [[noreturn]] is allowed on a
lambda: http://stackoverflow.com/questions/26888805/how-to-declare-a-lambdas-operator-as-noreturn

http://hydra.nixos.org/build/36462100
-rw-r--r--release.nix2
-rw-r--r--src/libstore/nar-info.cc3
2 files changed, 4 insertions, 1 deletions
diff --git a/release.nix b/release.nix
index 4803788fe009..b5e5e945e76c 100644
--- a/release.nix
+++ b/release.nix
@@ -99,6 +99,8 @@ let
 
         doInstallCheck = true;
         installCheckFlags = "sysconfdir=$(out)/etc";
+
+        stdenv = clangStdenv;
       });
 
 
diff --git a/src/libstore/nar-info.cc b/src/libstore/nar-info.cc
index c0c5cecd1730..4ff4c996dabd 100644
--- a/src/libstore/nar-info.cc
+++ b/src/libstore/nar-info.cc
@@ -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");
     };
 
@@ -14,6 +14,7 @@ NarInfo::NarInfo(const std::string & s, const std::string & whence)
             return parseHash(s);
         } catch (BadHash &) {
             corrupt();
+            return Hash(); // never reached
         }
     };