about summary refs log tree commit diff
path: root/src/libmain
diff options
context:
space:
mode:
Diffstat (limited to 'src/libmain')
-rw-r--r--src/libmain/Makefile.new2
-rw-r--r--src/libmain/shared.cc20
2 files changed, 0 insertions, 22 deletions
diff --git a/src/libmain/Makefile.new b/src/libmain/Makefile.new
index 86323dbd48ae..6ca49d583839 100644
--- a/src/libmain/Makefile.new
+++ b/src/libmain/Makefile.new
@@ -5,5 +5,3 @@ libmain_DIR := $(d)
 libmain_SOURCES = shared.cc stack.cc
 
 libmain_LIBS = libstore libutil libformat
-
-libmain_LDFLAGS_PROPAGATED = $(BDW_GC_LIBS)
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index b0b69f7f617d..8df2a7f52a52 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);