ruby-changes:61217
From: Nobuyoshi <ko1@a...>
Date: Tue, 12 May 2020 23:32:59 +0900 (JST)
Subject: [ruby-changes:61217] 1c4eb70654 (master): Build auxiliary program files early
https://git.ruby-lang.org/ruby.git/commit/?id=1c4eb70654 From 1c4eb70654aa20dd7caf3ce31be944396c5d31b8 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Tue, 12 May 2020 23:19:20 +0900 Subject: Build auxiliary program files early diff --git a/common.mk b/common.mk index 807161f..65c0afd 100644 --- a/common.mk +++ b/common.mk @@ -304,7 +304,7 @@ ext/extinit.c: $(srcdir)/template/extinit.c.tmpl https://github.com/ruby/ruby/blob/trunk/common.mk#L304 $(srcdir)/template/extinit.c.tmpl $(EXTINITS) prog: program wprogram -programs: $(PROGRAM) $(WPROGRAM) +programs: $(PROGRAM) $(WPROGRAM) $(arch)-fake.rb $(PREP): $(MKFILES) @@ -817,7 +817,7 @@ $(RBCONFIG): $(tooldir)/mkconfig.rb config.status $(srcdir)/version.h https://github.com/ruby/ruby/blob/trunk/common.mk#L817 test-rubyspec: test-spec yes-test-rubyspec: yes-test-spec -test-spec-precheck: $(arch)-fake.rb programs +test-spec-precheck: programs test-spec: $(TEST_RUNNABLE)-test-spec yes-test-spec: test-spec-precheck @@ -1315,7 +1315,7 @@ update-bundled_gems: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1315 "$(srcdir)/gems/bundled_gems" | \ "$(IFCHANGE)" "$(srcdir)/gems/bundled_gems" - -test-bundled-gems-precheck: $(arch)-fake.rb programs +test-bundled-gems-precheck: programs test-bundled-gems-fetch: $(PREP) $(Q) $(BASERUBY) -C $(srcdir)/gems ../tool/fetch-bundled_gems.rb src bundled_gems @@ -1335,7 +1335,7 @@ no-test-bundled-gems: https://github.com/ruby/ruby/blob/trunk/common.mk#L1335 test-bundled-gems-run: $(PREPARE_BUNDLED_GEMS) $(Q) $(XRUBY) $(tooldir)/test-bundled-gems.rb -test-bundler-precheck: $(arch)-fake.rb programs +test-bundler-precheck: programs yes-test-bundler-prepare: test-bundler-precheck $(XRUBY) -C "$(srcdir)" bin/gem install --no-document \ diff --git a/template/Makefile.in b/template/Makefile.in index 33ea093..c674de9 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -675,7 +675,7 @@ mjit_config.h: https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L675 echo '#endif /* RUBY_MJIT_CONFIG_H */'; \ } > $@ -yes-test-almost yes-test-all: mjit_build_dir.$(SOEXT) +yes-test-almost yes-test-all programs: mjit_build_dir.$(SOEXT) mjit_build_dir.$(SOEXT): $(MJIT_MIN_HEADER) $(srcdir)/ruby-runner.c ruby-runner.h $(ECHO) making $@ $(Q) $(DLDSHARED) $(MJIT_DLDFLAGS) $(ARCH_FLAG) $(CFLAGS) $(INCFLAGS) $(CPPFLAGS) \ -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/