aboutsummaryrefslogtreecommitdiff
path: root/src/libmain/shared.cc
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-11-23 20:19:36 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-11-23 20:19:36 +0000
commit5a1114ecdbbd115ec8aeb1a98326d793ff3e8058 (patch)
treefc14cd61a7bfc2b53b28957e0c6f60ac40d1b7d9 /src/libmain/shared.cc
parent06a8ac96e79547c092debfe3b93d78bcb862edc2 (diff)
Drop the dependency on libgc in libmain
Instead, libexpr now depends on libgc. This means commands like nix-store that don't do any evaluation no longer require libgc.
Diffstat (limited to 'src/libmain/shared.cc')
-rw-r--r--src/libmain/shared.cc20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index b0b69f7f6..8df2a7f52 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -15,10 +15,6 @@
#include <unistd.h>
#include <signal.h>
-#if HAVE_BOEHMGC
-#include <gc/gc.h>
-#endif
-
namespace nix {
@@ -231,14 +227,6 @@ static void initAndRun(int argc, char * * argv)
}
-/* Called when the Boehm GC runs out of memory. */
-static void * oomHandler(size_t requested)
-{
- /* Convert this to a proper C++ exception. */
- throw std::bad_alloc();
-}
-
-
void showManPage(const string & name)
{
string cmd = "man " + name;
@@ -268,14 +256,6 @@ int main(int argc, char * * argv)
std::ios::sync_with_stdio(false);
-#if HAVE_BOEHMGC
- /* Initialise the Boehm garbage collector. This isn't necessary
- on most platforms, but for portability we do it anyway. */
- GC_INIT();
-
- GC_oom_fn = oomHandler;
-#endif
-
try {
try {
initAndRun(argc, argv);