summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2020-05-12 23:19:20 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2020-05-12 23:19:20 +0900
commit1c4eb70654aa20dd7caf3ce31be944396c5d31b8 (patch)
treeefa12d840ffbaa8ba8bae331a99dbb3037f656f4
parent2383cdabc124734f03104d20d102308a9d155ea6 (diff)
Build auxiliary program files early
-rw-r--r--common.mk8
-rw-r--r--template/Makefile.in2
2 files changed, 5 insertions, 5 deletions
diff --git a/common.mk b/common.mk
index 807161fb22..65c0afd0e5 100644
--- a/common.mk
+++ b/common.mk
@@ -304,7 +304,7 @@ ext/extinit.c: $(srcdir)/template/extinit.c.tmpl
$(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
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
"$(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:
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 33ea093838..c674de968e 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -675,7 +675,7 @@ mjit_config.h:
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) \