diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-06-19 14:02:46 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-06-19 14:02:46 +0900 |
| commit | 1e7c0ccb0dbe4d65f914a3547aa6ea2503199f01 (patch) | |
| tree | b1f4a597e7fd4172cfee7a08bc0f0dea9dfa0f2f | |
| parent | 0d38a51ec42af3bcef46344d55e3bf1a871d8dc0 (diff) | |
Now bundled gems are extracted under .bundle/gems
| -rw-r--r-- | template/configure-ext.mk.tmpl | 2 | ||||
| -rw-r--r-- | template/exts.mk.tmpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/template/configure-ext.mk.tmpl b/template/configure-ext.mk.tmpl index 489f6e2a92..630e4a10dc 100644 --- a/template/configure-ext.mk.tmpl +++ b/template/configure-ext.mk.tmpl @@ -16,7 +16,7 @@ srcdir ||= File.dirname(File.dirname(__FILE__)) exts = {} [ ["exts", "ext", "--extstatic $(EXTSTATIC)"], - ["gems", "gems", "--no-extstatic"], + ["gems", ".bundle/gems", "--no-extstatic"], ].each do |t, d, o| exts[t] = [o, Dir.glob("#{srcdir}/#{d}/*/").map {|n| n[(srcdir.size+1)..-2]}] end diff --git a/template/exts.mk.tmpl b/template/exts.mk.tmpl index 4271bfda0a..521b9b2708 100644 --- a/template/exts.mk.tmpl +++ b/template/exts.mk.tmpl @@ -17,7 +17,7 @@ opt = OptionParser.new do |o| o.order!(ARGV) end contpat = /(?>(?>[^\\\n]|\\.)*\\\n)*(?>[^\\\n]|\\.)*/ -Dir.glob("{ext,gems}/*/exts.mk") do |e| +Dir.glob("{ext,.bundle/gems}/*/exts.mk") do |e| gem = /\Agems(?=\/)/ =~ e s = File.read(e) s.scan(/^(extensions|SUBMAKEOPTS|EXT[A-Z]+|MFLAGS|NOTE_[A-Z]+)[ \t]*=[ \t]*(#{contpat})$/o) do |n, v| |