diff options
| author | p01arst0rm <polar@ever3st.com> | 2019-10-21T16·57+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-17T14·55+0100 |
| commit | 055139ac6aaecc7193972b65d2bcca022969c61d (patch) | |
| tree | 3fb9b6c3aee1a06a40ee3edda1c41ff7df95a9ab /third_party/nix/src/libutil/util.cc | |
| parent | c455f7a987fff8fef459d340865368b1da28cecd (diff) | |
feat(3p/nix): added meson support r/726
(cherry picked from commit 086a81b7a5bbe1fc022efb5935ff68f6ad71ddaf)
Diffstat (limited to 'third_party/nix/src/libutil/util.cc')
| -rw-r--r-- | third_party/nix/src/libutil/util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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"); } |