Skip to content

Commit 926f943

Browse files
committed
extract-gems-sequential: Keep using RUNRUBY
1. sorah-rbpkg's modified rubyN.M-gems requires to kick extract-gems and our build environment has no BASERUBY. Partially reverts ruby/ruby#6203 2. For the same reason, partially reverting ruby/ruby#7347 to avoid calling git for extracting gems. Gbp-Pq: Name extract-gems-sequential-Keep-using-RUNRUBY.patch
1 parent 547423a commit 926f943

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

common.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1537,7 +1537,7 @@ update-gems$(gnumake:yes=-sequential): PHONY
15371537

15381538
extract-gems$(gnumake:yes=-sequential): PHONY
15391539
$(ECHO) Extracting bundled gem files...
1540-
$(Q) $(BASERUBY) -C "$(srcdir)" \
1540+
$(Q) $(RUNRUBY) -C "$(srcdir)" \
15411541
-Itool/lib -rfileutils -rbundled_gem -answ \
15421542
-e 'BEGIN {d = ".bundle/gems"}' \
15431543
-e 'gem, ver, _, rev = *$$F' \
@@ -1551,8 +1551,6 @@ extract-gems$(gnumake:yes=-sequential): PHONY
15511551
-e 'end' \
15521552
gems/bundled_gems
15531553

1554-
extract-gems$(gnumake:yes=-sequential): $(HAVE_GIT:yes=clone-bundled-gems-src)
1555-
15561554
clone-bundled-gems-src: PHONY
15571555
$(Q) $(BASERUBY) -C "$(srcdir)" \
15581556
-Itool/lib -rbundled_gem -answ \

0 commit comments

Comments
 (0)