From 2e324b645e16e67c14de80ea34b1d61165045f22 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Wed, 14 Sep 2022 00:58:43 +0900
Subject: [PATCH] Manage paths for bundler tests

---
 common.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common.mk b/common.mk
index 64d771fa1c..9d7b30b32b 100644
--- a/common.mk
+++ b/common.mk
@@ -1475,7 +1475,10 @@ RSPECOPTS =
 BUNDLER_SPECS =
 test-bundler: $(TEST_RUNNABLE)-test-bundler
 yes-test-bundler: yes-test-bundler-prepare
-	$(gnumake_recursive)$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec \
+	$(gnumake_recursive)$(XRUBY) \
+		-r./$(arch)-fake \
+		-e "exec(*ARGV)" -- \
+		$(XRUBY) -C $(srcdir) -Ispec/bundler .bundle/bin/rspec \
 		--require spec_helper $(RSPECOPTS) spec/bundler/$(BUNDLER_SPECS)
 no-test-bundler:
 
@@ -1483,6 +1486,7 @@ PARALLELRSPECOPTS = --runtime-log $(srcdir)/tmp/parallel_runtime_rspec.log
 test-bundler-parallel: $(TEST_RUNNABLE)-test-bundler-parallel
 yes-test-bundler-parallel: yes-test-bundler-prepare
 	$(gnumake_recursive)$(XRUBY) \
+		-r./$(arch)-fake \
 		-e "ARGV[-1] = File.expand_path(ARGV[-1])" \
 		-e "exec(*ARGV)" -- \
 		$(XRUBY) -I$(srcdir)/spec/bundler \