summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-10-20 14:07:59 (GMT)
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-10-20 14:07:59 (GMT)
commitb4766a4d9ee5dca0d9491ae320131f065242b574 (patch)
treeb93fde0d0b646f5ae8bd818a761c6c3753656f13 /win32
parent4e3e0ac4df1c409d4ef11a3f665652af67d3def9 (diff)
support --disable-mjit-support on mswin32/64.
* win32/configure.bat: add --enable/disable-mjit-support configure.bat options. * win32/setup.mak: ditto. * win32/Makefile.sub: ditto. * win32/Makefile.sub: fix typo for congig.status file. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub6
-rwxr-xr-xwin32/configure.bat12
-rw-r--r--win32/setup.mak3
3 files changed, 20 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 1af689f..f81af2d 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 09de87a..fa8966e 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 9e00ccc..8caafa4 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
<<