1 files changed, 10 insertions, 5 deletions
diff --git a/main.c b/main.c
index 0d0ec147cd..525189db85 100644
--- a/main.c
+++ b/main.c
@@ -20,9 +20,11 @@
 #undef RUBY_EXPORT
 #include "ruby.h"
 #include "vm_debug.h"
+#include "internal/sanitizers.h"
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif
+
 #if defined RUBY_DEVEL && !defined RUBY_DEBUG_ENV
 # define RUBY_DEBUG_ENV 1
 #endif
@@ -30,6 +32,8 @@
 # undef RUBY_DEBUG_ENV
 #endif
 
+RUBY_GLOBAL_SETUP
+
 static int
 rb_main(int argc, char **argv)
 {
@@ -38,15 +42,16 @@ rb_main(int argc, char **argv)
     return ruby_run_node(ruby_options(argc, argv));
 }
 
-#if defined(__wasm__) && !defined(__EMSCRIPTEN__)
-int rb_wasm_rt_start(int (main)(int argc, char **argv), int argc, char **argv);
-#define rb_main(argc, argv) rb_wasm_rt_start(rb_main, argc, argv)
+#ifdef _WIN32
+#define main(argc, argv) w32_main(argc, argv)
+static int main(int argc, char **argv);
+int wmain(void) {return main(0, NULL);}
 #endif
 
 int
 main(int argc, char **argv)
 {
-#ifdef RUBY_DEBUG_ENV
+#if defined(RUBY_DEBUG_ENV) || USE_RUBY_DEBUG_LOG
     ruby_set_debug_option(getenv("RUBY_DEBUG"));
 #endif
 #ifdef HAVE_LOCALE_H
@@ -54,5 +59,5 @@ main(int argc, char **argv)
 #endif
 
     ruby_sysinit(&argc, &argv);
-    return rb_main(argc, argv);
+    return ruby_start_main(rb_main, argc, argv);
 }