summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-05 07:28:32 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-05 07:28:32 +0000
commit7cc6bfa32947dcc60dab6e47250409b7962b29e7 (patch)
treedd209259f9ad49a975ae4047da6957cf4927434a
parentc38ee00226517bae961fe19cc5ad4f11b91c69fc (diff)
common.mk: gdb-ruby
* Makefile.in (RUNRUBY_COMMAND): split from RUNRUBY. * common.mk (gdb-ruby): use runruby.rb to set up library path. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--Makefile.in4
-rw-r--r--common.mk2
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index 8087065bea..8d36063c97 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,7 +89,9 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
RUBY = $(RUBY_INSTALL_NAME)
MINIRUBY = @MINIRUBY@\
$(MINIRUBYOPT)
-RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) -- $(RUN_OPTS)
+RUNRUBY_COMMAND = @RUNRUBY@ $(RUNRUBYOPT)
+RUNRUBY = $(RUNRUBY_COMMAND) -- $(RUN_OPTS)
+RUNRUBY_DEBUGGER = --debugger='gdb -x run.gdb --quiet --args'
XRUBY = @XRUBY@
BTESTRUBY = @BTESTRUBY@\
$(MINIRUBYOPT)
diff --git a/common.mk b/common.mk
index 910948e2d1..d2818f6808 100644
--- a/common.mk
+++ b/common.mk
@@ -954,7 +954,7 @@ gdb: miniruby$(EXEEXT) run.gdb PHONY
gdb -x run.gdb --quiet --args $(MINIRUBY) $(TESTRUN_SCRIPT)
gdb-ruby: $(PROGRAM) run.gdb PHONY
- gdb -x run.gdb --quiet --args $(PROGRAM) $(TESTRUN_SCRIPT)
+ $(Q) $(RUNRUBY_COMMAND) $(RUNRUBY_DEBUGGER) -- $(TESTRUN_SCRIPT)
dist:
$(BASERUBY) $(srcdir)/tool/make-snapshot tmp $(RELNAME)