summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <[email protected]>2024-08-21 13:21:09 +0900
committerNobuyoshi Nakada <[email protected]>2024-08-21 16:56:44 +0900
commit6ab591f80aa19d63ecd1e1df3c09c391efb318a6 (patch)
treead8915d1364ca251ba2f8950cb9015ae9823bcbd
parent71c14c8889b92561981677e47d72ab7f430fad91 (diff)
[Bug #20687] Check if base ruby provides necessary libraries
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/11419
-rw-r--r--configure.ac2
-rwxr-xr-xtool/missing-baseruby.bat4
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 9660d3a6dd..884fe9a412 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,7 +83,7 @@ AC_ARG_WITH(baseruby,
AC_PATH_PROG([BASERUBY], [ruby], [false])
])
AS_IF([test "$HAVE_BASERUBY" != no], [
- RUBYOPT=- $BASERUBY --disable=gems "${tooldir}/missing-baseruby.bat" || HAVE_BASERUBY=no
+ RUBYOPT=- $BASERUBY --disable=gems -rerb -rfileutils -rtempfile "${tooldir}/missing-baseruby.bat" || HAVE_BASERUBY=no
])
AS_IF([test "${HAVE_BASERUBY:=no}" != no], [
AS_CASE(["$build_os"], [mingw*], [
diff --git a/tool/missing-baseruby.bat b/tool/missing-baseruby.bat
index 87a9857e06..fcc75ea902 100755
--- a/tool/missing-baseruby.bat
+++ b/tool/missing-baseruby.bat
@@ -7,6 +7,10 @@
exit /b 1
)||(
:)"||(
+ # necessary libraries
+ require 'erb'
+ require 'fileutils'
+ require 'tempfile'
s = %^#
)
: ; call() { local call=${1#:}; shift; $call "$@"; }