diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | Makefile.in | 6 | ||||
-rw-r--r-- | common.mk | 2 | ||||
-rw-r--r-- | configure.in | 3 |
4 files changed, 18 insertions, 3 deletions
@@ -1,3 +1,13 @@ +Fri Jan 4 17:58:16 2013 Yuki Yugui Sonoda <yugui@yugui.jp> + + * common.mk (yes-btest): btest depends on also $(arch)-fake.rb and + rbconfig.rb on building for NativeClient. + + * Makefile.in (fake): Avoid generating $(arch)-fake.rb unless cross + compiling. + + * configure.in (CROSS_COMPILING): New substitution. + Fri Jan 4 16:26:45 2013 Eric Hodel <drbrain@segment7.net> * lib/rubygems/doctor.rb: Process directories in order in case the diff --git a/Makefile.in b/Makefile.in index c0f638fdcf..f652db2027 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,6 +26,7 @@ AUTOCONF = autoconf MKFILES = @MAKEFILES@ BASERUBY = @BASERUBY@ TEST_RUNNABLE = @TEST_RUNNABLE@ +CROSS_COMPILING = @CROSS_COMPILING@ DOXYGEN = @DOXYGEN@ prefix = @prefix@ @@ -221,8 +222,9 @@ $(LIBRUBY_SO): @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \ File.symlink "$(LIBRUBY_SO)", link}' \ $(LIBRUBY_ALIASES) || true - -fake: $(arch)-fake.rb +fake: $(CROSS_COMPILING)-fake +yes-fake: $(arch)-fake.rb $(RBCONFIG) PHONY +no-fake: PHONY $(arch)-fake.rb: config.status $(srcdir)/template/fake.rb.in @./config.status --file=$@:$(srcdir)/template/fake.rb.in @chmod +x $@ @@ -477,7 +477,7 @@ check-ruby: test test-ruby btest: $(TEST_RUNNABLE)-btest no-btest: PHONY -yes-btest: miniruby$(EXEEXT) PHONY +yes-btest: fake miniruby$(EXEEXT) PHONY $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY)" $(OPTS) $(TESTOPTS) btest-ruby: $(TEST_RUNNABLE)-btest-ruby diff --git a/configure.in b/configure.in index f6b0b57851..5475abc278 100644 --- a/configure.in +++ b/configure.in @@ -2525,6 +2525,7 @@ if test x"$cross_compiling" = xyes; then RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`' XRUBY='$(MINIRUBY)' TEST_RUNNABLE=no + CROSS_COMPILING=yes if test "$host_os" = "nacl"; then if test "$build_cpu" = "$host_cpu" || test "${nacl_cv_cpu_nick}" = "x86" -a "$host_cpu" = "i686"; then @@ -2546,8 +2547,10 @@ else RUNRUBY='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT)' XRUBY='$(RUNRUBY)' TEST_RUNNABLE=yes + CROSS_COMPILING=no fi AC_SUBST(TEST_RUNNABLE) +AC_SUBST(CROSS_COMPILING) AC_SUBST(MINIRUBY) AC_SUBST(BTESTRUBY) AC_SUBST(PREP) |