kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

support --disable-mjit-support on mswin32/64.

Browse source 
* 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
This commit is contained in:
ko1 2018-10-20 14:07:59 +00:00
parent 4e3e0ac4df
commit b4766a4d9e
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
win32/Makefile.sub
View file

@ -864,7 +864,11 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
#define RUBY_COREDLL "$(RT)" #define RUBY_COREDLL "$(RT)"
#define RUBY_PLATFORM "$(arch)" #define RUBY_PLATFORM "$(arch)"
#define RUBY_SITEARCH "$(sitearch)" #define RUBY_SITEARCH "$(sitearch)"
!if "$(MJIT_SUPPORT)" == "yes"
#define USE_MJIT 1 #define USE_MJIT 1
!else
#define USE_MJIT 0
!endif
#endif /* $(guard) */ #endif /* $(guard) */
<< <<
@ -1053,7 +1057,7 @@ s,@srcdir@,$(srcdir),;t t
s,@top_srcdir@,$(srcdir),;t t s,@top_srcdir@,$(srcdir),;t t
s,@try_header@,try_compile,;t t s,@try_header@,try_compile,;t t
s,@ruby_pc@,$(ruby_pc),;t t s,@ruby_pc@,$(ruby_pc),;t t
s,@MJIT_SUPPORT,$(MJIT_SUPPORT),;t t s,@MJIT_SUPPORT@,$(MJIT_SUPPORT),;t t
<<KEEP <<KEEP
miniruby: miniruby$(EXEEXT) miniruby: miniruby$(EXEEXT)

12
win32/configure.bat
View file

@ -36,6 +36,8 @@ if "%1" == "--enable-debug-env" goto :enable-debug-env
if "%1" == "--disable-debug-env" goto :disable-debug-env if "%1" == "--disable-debug-env" goto :disable-debug-env
if "%1" == "--enable-rubygems" goto :enable-rubygems if "%1" == "--enable-rubygems" goto :enable-rubygems
if "%1" == "--disable-rubygems" goto :disable-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" == "--extout" goto :extout
if "%1" == "--path" goto :path if "%1" == "--path" goto :path
if "%1" == "--with-baseruby" goto :baseruby if "%1" == "--with-baseruby" goto :baseruby
@ -152,6 +154,16 @@ goto :loop ;
echo>>confargs.tmp %1 \ echo>>confargs.tmp %1 \
shift shift
goto :loop ; 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 :ntver
echo>> ~tmp~.mak "NTVER=%~2" \ echo>> ~tmp~.mak "NTVER=%~2" \
echo>>confargs.tmp %1=%2 \ echo>>confargs.tmp %1=%2 \

3
win32/setup.mak
View file

@ -60,6 +60,9 @@ USE_RUBYGEMS = $(USE_RUBYGEMS)
!if defined(ENABLE_DEBUG_ENV) !if defined(ENABLE_DEBUG_ENV)
ENABLE_DEBUG_ENV = $(ENABLE_DEBUG_ENV) ENABLE_DEBUG_ENV = $(ENABLE_DEBUG_ENV)
!endif !endif
!if defined(MJIT_SUPPORT)
MJIT_SUPPORT = $(MJIT_SUPPORT)
!endif
# TOOLS # TOOLS
<< <<