Fix macOS test

Author: edolstra

src/libutil-tests/fun.cc

@@ -2,6 +2,7 @@
 #include <type_traits>
 
 #include "nix/util/fun.hh"
+#include "util-tests-config.hh"
 
 namespace nix {
 
@@ -39,19 +40,31 @@ TEST(fun, moveConstructFromStdFunction)
 TEST(fun, rejectsEmptyStdFunction)
 {
     std::function<int(int)> empty;
+#if HAVE_CXA_THROW
     ASSERT_DEATH((fun<int(int)>{empty}), "invalid_argument");
+#else
+    EXPECT_THROW((fun<int(int)>{empty}), std::invalid_argument);
+#endif
 }
 
 TEST(fun, rejectsEmptyStdFunctionMove)
 {
     std::function<int(int)> empty;
+#if HAVE_CXA_THROW
     ASSERT_DEATH((fun<int(int)>{std::move(empty)}), "invalid_argument");
+#else
+    EXPECT_THROW((fun<int(int)>{std::move(empty)}), std::invalid_argument);
+#endif
 }
 
 TEST(fun, rejectsNullFunctionPointer)
 {
     int (*nullFp)(int) = nullptr;
+#if HAVE_CXA_THROW
     ASSERT_DEATH((fun<int(int)>{nullFp}), "invalid_argument");
+#else
+    EXPECT_THROW((fun<int(int)>{nullFp}), std::invalid_argument);
+#endif
 }
 
 TEST(fun, nullptrDeletedAtCompileTime)

src/libutil-tests/meson.build

@@ -36,16 +36,17 @@ deps_private += gtest
 gmock = dependency('gmock')
 deps_private += gmock
 
+subdir('nix-meson-build-support/common')
+
 configdata = configuration_data()
 configdata.set_quoted('PACKAGE_VERSION', meson.project_version())
+configdata.set('HAVE_CXA_THROW', have_cxa_throw.to_int())
 
 config_priv_h = configure_file(
   configuration : configdata,
   output : 'util-tests-config.hh',
 )
 
-subdir('nix-meson-build-support/common')
-
 sources = files(
   'alignment.cc',
   'archive.cc',