3 files changed, 20 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 1af689f7dc..f81af2d55c 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -864,7 +864,11 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
 #define RUBY_COREDLL "$(RT)"
 #define RUBY_PLATFORM "$(arch)"
 #define RUBY_SITEARCH "$(sitearch)"
+!if "$(MJIT_SUPPORT)" == "yes"
 #define USE_MJIT 1
+!else
+#define USE_MJIT 0
+!endif
 #endif /* $(guard) */
 <<
 
@@ -1053,7 +1057,7 @@ s,@srcdir@,$(srcdir),;t t
 s,@top_srcdir@,$(srcdir),;t t
 s,@try_header@,try_compile,;t t
 s,@ruby_pc@,$(ruby_pc),;t t
-s,@MJIT_SUPPORT,$(MJIT_SUPPORT),;t t
+s,@MJIT_SUPPORT@,$(MJIT_SUPPORT),;t t
 <<KEEP
 
 miniruby: miniruby$(EXEEXT)
diff --git a/win32/configure.bat b/win32/configure.bat
index 09de87a1a5..fa8966e0c9 100755
--- a/win32/configure.bat
+++ b/win32/configure.bat
@@ -36,6 +36,8 @@ if "%1" == "--enable-debug-env" goto :enable-debug-env
 if "%1" == "--disable-debug-env" goto :disable-debug-env
 if "%1" == "--enable-rubygems" goto :enable-rubygems
 if "%1" == "--disable-rubygems" goto :disable-rubygems
+if "%1" == "--enable-mjit-support" goto :enable-mjit-support
+if "%1" == "--disable-mjit-support" goto :disable-mjit-support
 if "%1" == "--extout" goto :extout
 if "%1" == "--path" goto :path
 if "%1" == "--with-baseruby" goto :baseruby
@@ -152,6 +154,16 @@ goto :loop ;
   echo>>confargs.tmp %1 \
   shift
 goto :loop ;
+:enable-mjit-support
+  echo>> ~tmp~.mak 	"MJIT_SUPPORT=yes" \
+  echo>>confargs.tmp %1 \
+  shift
+goto :loop ;
+:disable-mjit-support
+  echo>> ~tmp~.mak 	"MJIT_SUPPORT=no" \
+  echo>>confargs.tmp %1 \
+  shift
+goto :loop ;
 :ntver
   echo>> ~tmp~.mak 	"NTVER=%~2" \
   echo>>confargs.tmp  %1=%2 \
diff --git a/win32/setup.mak b/win32/setup.mak
index 9e00ccc118..8caafa4eea 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -60,6 +60,9 @@ USE_RUBYGEMS = $(USE_RUBYGEMS)
 !if defined(ENABLE_DEBUG_ENV)
 ENABLE_DEBUG_ENV = $(ENABLE_DEBUG_ENV)
 !endif
+!if defined(MJIT_SUPPORT)
+MJIT_SUPPORT = $(MJIT_SUPPORT)
+!endif
 
 # TOOLS
 <<