diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-04-20 08:31:20 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-04-20 08:31:20 +0000 |
commit | 23e481e390ecf9b1ea438ab9a6cab0079f811e61 (patch) | |
tree | a4779a020f27f8f8fb2d9d8bd9bcc0c9cd101dae | |
parent | 7b3ac07781be812468674911825e86cd82dfb5b8 (diff) | |
download | ruby-23e481e390ecf9b1ea438ab9a6cab0079f811e61.tar.gz |
common.mk: separate note
* common.mk (build-ext): separate note from building extensions,
not to be intermingled. [ruby-core:80759] [Feature #13302]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | common.mk | 1 | ||||
-rw-r--r-- | template/exts.mk.tmpl | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -235,6 +235,7 @@ configure-ext: $(EXTS_MK) build-ext: $(EXTS_MK) $(Q)$(MAKE) -f $(EXTS_MK) $(mflags) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \ EXTENCS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC) + $(Q)$(MAKE) -f $(EXTS_MK) $(mflags) note ext/extinit.c: $(srcdir)/template/extinit.c.tmpl $(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \ diff --git a/template/exts.mk.tmpl b/template/exts.mk.tmpl index 1b2308c4f0..53350f23df 100644 --- a/template/exts.mk.tmpl +++ b/template/exts.mk.tmpl @@ -46,7 +46,7 @@ Dir.glob("{ext,gems}/*/exts.mk") do |e| (?:dist|real)?clean ):.+$ "x) do - deps << $& + deps << $&.sub(/ +note$/, '') end s.scan(%r"^note:\n((?:\t.+\n)+)") do |(n)| n = n.split(/^/) |