[前][次][番号順一覧][スレッド一覧]

ruby-changes:73393

From: Nobuyoshi <ko1@a...>
Date: Sat, 3 Sep 2022 19:27:54 +0900 (JST)
Subject: [ruby-changes:73393] 21a5da3c4c (master): Check if MSys shell can run a command with a drive letter

https://git.ruby-lang.org/ruby.git/commit/?id=21a5da3c4c

From 21a5da3c4c803987c48bc9ca588948c50715631a Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sat, 3 Sep 2022 03:21:23 +0900
Subject: Check if MSys shell can run a command with a drive letter

---
 configure.ac | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0f4a31af7e..2fd68c0013 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,13 +65,19 @@ AC_ARG_WITH(baseruby, https://github.com/ruby/ruby/blob/trunk/configure.ac#L65
 		AC_PATH_PROG([BASERUBY], [ruby], [false])
 	])
 AS_IF([test "$HAVE_BASERUBY" != no -a "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42 if RUBY_VERSION > "2.2"' 2>/dev/null`" = 42], [
+    AS_CASE(["$build_os"], [mingw*], [
+        # Can MSys shell run a command with a drive letter?
+        RUBYOPT=- `cygpath -ma "$BASERUBY"` --disable=gems -e exit 2>/dev/null || HAVE_BASERUBY=no
+    ])
     BASERUBY="$BASERUBY --disable=gems"
     BASERUBY_VERSION=`$BASERUBY -v`
     $BASERUBY -C "$srcdir" tool/downloader.rb -d tool -e gnu config.guess config.sub >&AS_MESSAGE_FD
 ], [
-    BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
     HAVE_BASERUBY=no
 ])
+AS_IF([test "$HAVE_BASERUBY" = no], [
+    BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
+])
 AC_SUBST(BASERUBY)
 AC_SUBST(HAVE_BASERUBY)
 
@@ -3364,7 +3370,7 @@ AS_IF([test x"$cross_compiling" = xyes], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L3370
   RUNRUBY_COMMAND='$(MINIRUBY) $(tooldir)/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)'
   RUNRUBY='$(RUNRUBY_COMMAND) --'
   XRUBY='$(RUNRUBY)'
-  AS_CASE(["$HAVE_BASERUBY:$build_os"], [no:*|*:mingw*], [BOOTSTRAPRUBY='$(MINIRUBY)'])
+  AS_CASE(["$HAVE_BASERUBY"], [no], [BOOTSTRAPRUBY='$(MINIRUBY)'])
   TEST_RUNNABLE=yes
   CROSS_COMPILING=no
 ])
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]