archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 00:54:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Allow --without-baseruby option

Browse source 
* configure.in, win32/configure.bat: allow --without-baseruby
  option to use already generated files without baseruby.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-04-10 01:22:49 +00:00
parent 0ab20b48c5
commit b68fb2efce
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
configure.in
View file

@ -39,18 +39,19 @@ rm() {
AC_ARG_WITH(baseruby, AC_ARG_WITH(baseruby,
AS_HELP_STRING([--with-baseruby=RUBY], [use RUBY as baseruby; RUBY is the pathname of ruby]), AS_HELP_STRING([--with-baseruby=RUBY], [use RUBY as baseruby; RUBY is the pathname of ruby]),
[ [AS_CASE(["$withval"],
AS_CASE(["$withval"],[*ruby*],[BASERUBY=$withval],[AC_MSG_ERROR(need ruby)]) [*ruby*],[BASERUBY=$withval; HAVE_BASERUBY=yes],
[no],[HAVE_BASERUBY=no],
[AC_MSG_ERROR(need ruby)])
], ],
[ [
AC_PATH_PROG([BASERUBY], [ruby], [false]) AC_PATH_PROG([BASERUBY], [ruby], [false])
]) ])
if test "`RUBYOPT=- $BASERUBY -e 'print 42' 2>/dev/null`" = 42; then if test "$HAVE_BASERUBY" = yes -a "`RUBYOPT=- $BASERUBY -e 'print 42' 2>/dev/null`" = 42; then
if test "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42' 2>/dev/null`" = 42; then if test "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42' 2>/dev/null`" = 42; then
BASERUBY="$BASERUBY --disable=gems" BASERUBY="$BASERUBY --disable=gems"
fi fi
$BASERUBY -C "$srcdir/tool" downloader.rb -e gnu config.guess config.sub $BASERUBY -C "$srcdir/tool" downloader.rb -e gnu config.guess config.sub
HAVE_BASERUBY=yes
else else
BASERUBY="echo executable host ruby is required. use --with-baseruby option.; false" BASERUBY="echo executable host ruby is required. use --with-baseruby option.; false"
HAVE_BASERUBY=no HAVE_BASERUBY=no

6
win32/configure.bat
View file

@ -39,6 +39,7 @@ if "%1" == "--disable-rubygems" goto :disable-rubygems
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
if "%1" == "--without-baseruby" goto :baseruby
if "%1" == "--with-ntver" goto :ntver if "%1" == "--with-ntver" goto :ntver
if "%1" == "--with-libdir" goto :libdir if "%1" == "--with-libdir" goto :libdir
if "%1" == "--with-git" goto :git if "%1" == "--with-git" goto :git
@ -175,6 +176,11 @@ goto :loop ;
shift shift
shift shift
goto :loop ; goto :loop ;
:nobaseruby
echo>> ~tmp~.mak "HAVE_BASERUBY=no" \
echo>>confargs.tmp %1=%2 \
shift
goto :loop ;
:libdir :libdir
echo>> ~tmp~.mak "libdir_basename=%~2" \ echo>> ~tmp~.mak "libdir_basename=%~2" \
echo>>confargs.tmp %1=%2 \ echo>>confargs.tmp %1=%2 \