X-Git-Url: http://nitlanguage.org

diff --git a/clib/gc_chooser.c b/clib/gc_chooser.c
index f40a23e..5cf3065 100644
--- a/clib/gc_chooser.c
+++ b/clib/gc_chooser.c
@@ -18,6 +18,9 @@
 #ifdef ANDROID
 	#include <android/log.h>
 	#define PRINT_ERROR(...) ((void)__android_log_print(ANDROID_LOG_WARN, "nit", __VA_ARGS__))
+
+	// FIXME bring back when the GC is fixed in Android
+	#undef WITH_LIBGC
 #else
 	#define PRINT_ERROR(...) ((void)fprintf(stderr, __VA_ARGS__))
 #endif
@@ -61,6 +64,7 @@ void nit_gcollect(void) {
 #ifdef WITH_LIBGC
 	case gc_opt_boehm: GC_gcollect(); break;
 #endif
+	default: break; /* nothing can be done */
 	}
 }
 
@@ -123,7 +127,7 @@ void initialize_gc_option(void) {
 
 void gc_register_finalizer(void* obj) {
 #ifdef WITH_LIBGC
-	GC_register_finalizer(obj, &gc_finalize, NULL, NULL, NULL);
+	GC_register_finalizer_no_order(obj, &gc_finalize, NULL, NULL, NULL);
 #endif
 }