From 055139ac6aaecc7193972b65d2bcca022969c61d Mon Sep 17 00:00:00 2001 From: p01arst0rm Date: Mon, 21 Oct 2019 17:57:38 +0100 Subject: feat(3p/nix): added meson support (cherry picked from commit 086a81b7a5bbe1fc022efb5935ff68f6ad71ddaf) --- third_party/nix/src/libutil/util.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'third_party/nix/src/libutil/util.cc') diff --git a/third_party/nix/src/libutil/util.cc b/third_party/nix/src/libutil/util.cc index ad8cc1894c14..05527473210d 100644 --- a/third_party/nix/src/libutil/util.cc +++ b/third_party/nix/src/libutil/util.cc @@ -33,7 +33,7 @@ #endif -extern char * * environ; +extern char * * environ __attribute__((weak)); namespace nix { @@ -1179,7 +1179,7 @@ void _interrupted() /* Block user interrupts while an exception is being handled. Throwing an exception while another exception is being handled kills the program! */ - if (!interruptThrown && !std::uncaught_exception()) { + if (!interruptThrown && !std::uncaught_exceptions()) { interruptThrown = true; throw Interrupted("interrupted by the user"); } -- cgit 1.4.1