Skip to content

Commit f4e9ee1

Browse files
committed
Re-enable nmake runirb
Skip RUBY_ON_BUG gdb hook on MSVC (MSC_VER) builds
1 parent bb472c5 commit f4e9ee1

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

common.mk

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,11 +1421,14 @@ $(srcdir)/ext/etc/constdefs.h: $(srcdir)/ext/etc/depend
14211421
run: yes-fake miniruby$(EXEEXT) PHONY
14221422
$(BTESTRUBY) $(RUNOPT0) $(TESTRUN_SCRIPT) $(RUNOPT)
14231423

1424+
# Don't use RUBY_ON_BUG if MSC_VER is present
1425+
RUBY_ON_BUG_SPEC$(MSC_VER) = RUBY_ON_BUG='gdb -x $(srcdir)/.gdbinit -p'
1426+
14241427
runruby: $(PROGRAM) PHONY
1425-
RUBY_ON_BUG='gdb -x $(srcdir)/.gdbinit -p' $(RUNRUBY) $(RUNOPT0) $(TESTRUN_SCRIPT) $(RUNOPT)
1428+
$(RUBY_ON_BUG_SPEC) $(RUNRUBY) $(RUNOPT0) $(TESTRUN_SCRIPT) $(RUNOPT)
14261429

14271430
runirb: $(PROGRAM) update-default-gemspecs
1428-
RUBY_ON_BUG='gdb -x $(srcdir)/.gdbinit -p' $(RUNRUBY) $(RUNOPT0) -rrubygems -r irb -e 'IRB.start("make runirb")' $(RUNOPT)
1431+
$(RUBY_ON_BUG_SPEC) $(RUNRUBY) $(RUNOPT0) -rrubygems -r irb -e 'IRB.start("make runirb")' $(RUNOPT)
14291432

14301433
parse: yes-fake miniruby$(EXEEXT) PHONY
14311434
$(BTESTRUBY) --dump=parsetree_with_comment,insns $(TESTRUN_SCRIPT)

0 commit comments

Comments
 (0)