summaryrefslogtreecommitdiff
path: root/template
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2022-10-21 15:12:41 +0900
committernagachika <nagachika@ruby-lang.org>2022-10-21 15:12:41 +0900
commitc740605d425a472fb9d4451791bd75c327aa7aa5 (patch)
treeeb11805f2691e098a1730dbb180f84fe16a73428 /template
parent57d14154a2e85bec2a5589810a4aa250b82ab864 (diff)
merge revision(s) 97ce030954dab3f219779e235bee53ba408fbaca:
Load fake.rb at `BTESTRUBY` So that `mkmf` checks work from `make run`, and also remove duplicate `$(MINIRUBYOPT)` which is used in `$(MINIRUBY)`. --- common.mk | 8 ++++---- template/Makefile.in | 3 +-- template/fake.rb.in | 2 ++ win32/Makefile.sub | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-)
Diffstat (limited to 'template')
-rw-r--r--template/Makefile.in3
-rw-r--r--template/fake.rb.in2
2 files changed, 3 insertions, 2 deletions
diff --git a/template/Makefile.in b/template/Makefile.in
index 5e776e3a57..55f03e6ed2 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -147,8 +147,7 @@ RUNRUBY = @RUNRUBY@ $(RUN_OPTS)
# RUNRUBY_DEBUGGER:: debugging option for runruby.rb
RUNRUBY_DEBUGGER = --debugger='gdb -x run.gdb --quiet --args'
XRUBY = @XRUBY@
-BTESTRUBY = @BTESTRUBY@\
- $(MINIRUBYOPT)
+BTESTRUBY = @BTESTRUBY@ -r./$(arch)-fake
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/template/fake.rb.in b/template/fake.rb.in
index 2280a4d8e7..7af17fa344 100644
--- a/template/fake.rb.in
+++ b/template/fake.rb.in
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+# shareable_constant_value: literal
<%
arg = {}
while /\A(\w+)=(.*)/ =~ ARGV[0]