diff options
| author | nagachika <nagachika@ruby-lang.org> | 2022-10-16 16:29:02 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2022-10-16 16:29:02 +0900 |
| commit | e3abdccca020496b047769e506db8da7342ea15f (patch) | |
| tree | 06e9d8578e53e6b332a42ae378cf0ad8da5f8a98 /template | |
| parent | 667aa81219ca080c0a4b9f97d29bb3221bd08a33 (diff) | |
merge revision(s) db3d111c1d1e90b400f1e737ded6a4e4bdf2cec8:
Bundled gems are expanded under `.bundle/gems` now
---
ext/extmk.rb | 13 +++++++------
template/exts.mk.tmpl | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
Diffstat (limited to 'template')
| -rw-r--r-- | template/exts.mk.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/template/exts.mk.tmpl b/template/exts.mk.tmpl index 924abeb2fb..909689514a 100644 --- a/template/exts.mk.tmpl +++ b/template/exts.mk.tmpl @@ -25,7 +25,7 @@ macros["old_extensions"] = [] contpat = /(?>(?>[^\\\n]|\\.)*\\\n)*(?>[^\\\n]|\\.)*/ Dir.glob("{ext,.bundle/gems}/*/exts.mk") do |e| - gem = /\Agems(?=\/)/ =~ e + gem = e.start_with?(".bundle/gems/") s = File.read(e) s.scan(/^(extensions|SUBMAKEOPTS|EXT[A-Z]+|MFLAGS|NOTE_[A-Z]+)[ \t]*=[ \t]*(#{contpat})$/o) do |n, v| v.gsub!(/\\\n[ \t]*/, ' ') |