diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 2 | ||||
| -rw-r--r-- | common.mk | 12 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
5 files changed, 17 insertions, 9 deletions
@@ -1,3 +1,11 @@ +Mon Dec 31 06:50:38 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * trunk/common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross + compiling. + + * configure.in, {win,bcc}32/Makefile.sub (MINIRUBY): -I$(srcdir)/lib + moved. + Mon Dec 31 06:08:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * include/ruby/encoding.h (rb_enc_sprintf, rb_enc_vsprintf): prototyped. diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index ca9f0adc00..291a655094 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -179,7 +179,7 @@ EXEEXT = .exe PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT) RUBYDEF = $(RUBY_SO_NAME).def -MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT) +MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT) RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" -- ORGLIBPATH = $(LIB) @@ -347,7 +347,7 @@ test-all: $(RUNRUBY) "$(srcdir)/test/runner.rb" --basedir="$(TESTSDIR)" --runner=$(TESTUI) $(TESTS) extconf: - $(MINIRUBY) -I$(srcdir)/lib -run -e mkdir -- -p "$(EXTCONFDIR)" + $(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)" $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS) $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP) @@ -356,7 +356,7 @@ $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP) -so_name=$(RUBY_SO_NAME) rbconfig.rb encs: enc.mk - $(MINIRUBY) -I$(srcdir)/lib -run -e mkdir -- -p "$(EXTOUT)/$(arch)/enc/trans" enc/trans + $(MINIRUBY) -run -e mkdir -- -p "$(EXTOUT)/$(arch)/enc/trans" enc/trans $(MAKE) -f enc.mk $(MFLAGS) enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \ @@ -668,10 +668,10 @@ miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $(RBCONFIG) - $(MINIRUBY) -I$(srcdir) -I$(srcdir)/lib -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $@ + $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/gem_prelude.rb $@ golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb - $(MINIRUBY) -I$(srcdir) -I$(srcdir)/lib -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/golf_prelude.rb $@ + $(MINIRUBY) -I$(srcdir) -rrbconfig $(srcdir)/tool/compile_prelude.rb $(srcdir)/golf_prelude.rb $@ prereq: incs srcs preludes @@ -691,7 +691,7 @@ $(srcdir)/ext/ripper/ripper.c: ## run: miniruby$(EXEEXT) PHONY - $(MINIRUBY) -I$(srcdir)/lib $(srcdir)/test.rb $(RUNOPT) + $(MINIRUBY) $(srcdir)/test.rb $(RUNOPT) runruby: $(PROGRAM) PHONY $(RUNRUBY) $(srcdir)/test.rb @@ -735,7 +735,7 @@ run.gdb: echo run >> run.gdb gdb: miniruby$(EXEEXT) run.gdb PHONY - gdb -x run.gdb --quiet --args $(MINIRUBY) -I$(srcdir)/lib $(srcdir)/test.rb + gdb -x run.gdb --quiet --args $(MINIRUBY) $(srcdir)/test.rb # Intel VTune diff --git a/configure.in b/configure.in index efc5dc5b77..26fc824ee8 100644 --- a/configure.in +++ b/configure.in @@ -1360,7 +1360,7 @@ if test x"$cross_compiling" = xyes; then PREP=fake.rb RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`' else - MINIRUBY='./miniruby$(EXEEXT)' + MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib' PREP='miniruby$(EXEEXT)' RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)' fi diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 8d9066e692..e9b1d10427 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -178,7 +178,7 @@ EXEEXT = .exe PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT) RUBYDEF = $(RUBY_SO_NAME).def -MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT) +MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT) RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" -- !if !defined(STACK) |