diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-22 04:13:02 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-22 04:13:02 +0000 |
| commit | 64a189d207cd000882eeca90cfe316f830570879 (patch) | |
| tree | 31b26a92932eec477f3a3407b2e3244d71b53746 /win32 | |
| parent | 0ad9c00525219306e890e76251c01ba32ae0259f (diff) | |
remove DISABLE_RUBYGEMS from config files
* configure.ac: removed DISABLE_RUBYGEMS macro from config.h, not
to rebuild everything when the flag changed.
* configure.ac, win32/configure.bat: make USE_RUBYGEMS lowercase.
* tool/mkconfig.rb: remove RUBYGEMS stuff from rbconfig.rb, not to
reconfigure and rebuild all extension libraries.
* Makefile.in (CPPFLAGS): enable/disable Rubygems by USE_RUBYGEMS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63718 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 3 | ||||
| -rwxr-xr-x | win32/configure.bat | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 48788c2aa6..20b47a581a 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -299,6 +299,9 @@ LDSHARED_1 = @if exist $(@).manifest $(MANIFESTTOOL) -manifest $(@).manifest -ou LDSHARED_2 = @if exist $(@).manifest @$(RM) $(@:/=\).manifest !endif CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS) +!if "$(USE_RUBYGEMS)" == "no" +CPPFLAGS = -DDISABLE_RUBYGEMS $(CPPFLAGS) +!endif !if "$(CPPOUTFLAG)" == ">" MJIT_HEADER_FLAGS = !else diff --git a/win32/configure.bat b/win32/configure.bat index cce2cc81a2..09de87a1a5 100755 --- a/win32/configure.bat +++ b/win32/configure.bat @@ -143,12 +143,12 @@ goto :loop ; shift
goto :loop ;
:enable-rubygems
- echo>> ~tmp~.mak "USE_RUBYGEMS=YES" \
+ echo>> ~tmp~.mak "USE_RUBYGEMS=yes" \
echo>>confargs.tmp %1 \
shift
goto :loop ;
:disable-rubygems
- echo>> ~tmp~.mak "USE_RUBYGEMS=NO" \
+ echo>> ~tmp~.mak "USE_RUBYGEMS=no" \
echo>>confargs.tmp %1 \
shift
goto :loop ;
|