diff options
-rw-r--r-- | common.mk | 3 | ||||
-rw-r--r-- | defs/gmake.mk | 1 |
2 files changed, 3 insertions, 1 deletions
@@ -1358,12 +1358,13 @@ update-gems$(gnumake:yes=-nongnumake): PHONY extract-gems$(gnumake:yes=-nongnumake): PHONY $(ECHO) Extracting bundled gem files... $(Q) $(RUNRUBY) -C "$(srcdir)" \ - -Itool -rgem-unpack -answ \ + -Itool -rfileutils -rgem-unpack -answ \ -e 'BEGIN {FileUtils.mkdir_p(d = ".bundle/gems")}' \ -e 'gem, ver = *$$F' \ -e 'next if !ver or /^#/=~gem' \ -e 'g = "#{gem}-#{ver}"' \ -e 'File.directory?("#{d}/#{g}") or Gem.unpack("gems/#{g}.gem", d)' \ + -e 'FileUtils.rm_rf("#{d}/#{g}/.github")' \ gems/bundled_gems update-bundled_gems: PHONY diff --git a/defs/gmake.mk b/defs/gmake.mk index c32fee0a6c..a625379a68 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -296,6 +296,7 @@ extract-gems: | $(patsubst %,.bundle/gems/%,$(bundled-gems)) $(Q) $(BASERUBY) -C "$(srcdir)" \ -Itool -rgem-unpack \ -e 'Gem.unpack("gems/$(@F).gem", ".bundle/gems")' + $(RMALL) "$(srcdir)/$(@:.gem=)/".git* $(srcdir)/.bundle/gems: $(MAKEDIRS) $@ |