1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* trunk/common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross

Browse Source 
compiling.

* configure.in, {win,bcc}32/Makefile.sub (MINIRUBY): -I$(srcdir)/lib
  moved.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-12-30 21:50:40 +00:00
parent 3d0260cc94
commit 74dd31fadf
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> Mon Dec 31 06:08:34 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/encoding.h (rb_enc_sprintf, rb_enc_vsprintf): prototyped. * include/ruby/encoding.h (rb_enc_sprintf, rb_enc_vsprintf): prototyped.

2
bcc32/Makefile.sub
View File

@ -179,7 +179,7 @@ EXEEXT = .exe
PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT) WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
RUBYDEF = $(RUBY_SO_NAME).def RUBYDEF = $(RUBY_SO_NAME).def
MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT) MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT)
RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" -- RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
ORGLIBPATH = $(LIB) ORGLIBPATH = $(LIB)

12
common.mk
View File

@ -347,7 +347,7 @@ test-all:
$(RUNRUBY) "$(srcdir)/test/runner.rb" --basedir="$(TESTSDIR)" --runner=$(TESTUI) $(TESTS) $(RUNRUBY) "$(srcdir)/test/runner.rb" --basedir="$(TESTSDIR)" --runner=$(TESTUI) $(TESTS)
extconf: extconf:
$(MINIRUBY) -I$(srcdir)/lib -run -e mkdir -- -p "$(EXTCONFDIR)" $(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)"
$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS) $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP) $(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 -so_name=$(RUBY_SO_NAME) rbconfig.rb
encs: enc.mk 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) $(MAKE) -f enc.mk $(MFLAGS)
enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \ 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 $@ $(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) 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 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 prereq: incs srcs preludes
@ -691,7 +691,7 @@ $(srcdir)/ext/ripper/ripper.c:
## ##
run: miniruby$(EXEEXT) PHONY run: miniruby$(EXEEXT) PHONY
$(MINIRUBY) -I$(srcdir)/lib $(srcdir)/test.rb $(RUNOPT) $(MINIRUBY) $(srcdir)/test.rb $(RUNOPT)
runruby: $(PROGRAM) PHONY runruby: $(PROGRAM) PHONY
$(RUNRUBY) $(srcdir)/test.rb $(RUNRUBY) $(srcdir)/test.rb
@ -735,7 +735,7 @@ run.gdb:
echo run >> run.gdb echo run >> run.gdb
gdb: miniruby$(EXEEXT) run.gdb PHONY 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 # Intel VTune

2
configure.in
View File

@ -1360,7 +1360,7 @@ if test x"$cross_compiling" = xyes; then
PREP=fake.rb PREP=fake.rb
RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`' RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
else else
MINIRUBY='./miniruby$(EXEEXT)' MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
PREP='miniruby$(EXEEXT)' PREP='miniruby$(EXEEXT)'
RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)' RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)'
fi fi

2
win32/Makefile.sub
View File

@ -178,7 +178,7 @@ EXEEXT = .exe
PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT) WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
RUBYDEF = $(RUBY_SO_NAME).def RUBYDEF = $(RUBY_SO_NAME).def
MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT) MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT)
RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" -- RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
!if !defined(STACK) !if !defined(STACK)