diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-28 05:02:41 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-28 05:02:41 +0000 |
| commit | cc33dd2b675f4ce8e9dd96498d4da9b1725cd2b7 (patch) | |
| tree | fcb7e6467b2c4735589925a04057ce49841b2ba7 /template/configure-ext.mk.tmpl | |
| parent | b3dbeb6e90f316584f70e33f6bfb9d83fa5f30d3 (diff) | |
extension gems in static-linked-exts
* template/configure-ext.mk.tmpl: --no-extstatic option to gems.
* template/exts.mk.tmpl: include extension gems.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'template/configure-ext.mk.tmpl')
| -rw-r--r-- | template/configure-ext.mk.tmpl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/template/configure-ext.mk.tmpl b/template/configure-ext.mk.tmpl index 0d079a4fde..069b58a571 100644 --- a/template/configure-ext.mk.tmpl +++ b/template/configure-ext.mk.tmpl @@ -14,25 +14,27 @@ opt = OptionParser.new do |o| end srcdir ||= File.dirname(File.dirname(__FILE__)) exts = {} -[["exts", "ext"], ["gems", "gems"]].each do |t, dir| - exts[t] = Dir.glob("#{srcdir}/#{dir}/*/").map {|n| n[(srcdir.size+1)..-2]} +[ + ["exts", "ext", "--extstatic $(EXTSTATIC)"], + ["gems", "gems", "--no-extstatic"], +].each do |t, dir, opt| + exts[t] = [opt, Dir.glob("#{srcdir}/#{dir}/*/").map {|n| n[(srcdir.size+1)..-2]}] end %> MINIRUBY = <%=miniruby%> SCRIPT_ARGS = <%=script_args%> -EXTMK_ARGS = $(SCRIPT_ARGS) --extstatic $(EXTSTATIC) \ - --gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \ +EXTMK_ARGS = $(SCRIPT_ARGS) --gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \ all: exts gems exts: gems: -% exts.each do |t, dirs| +% exts.each do |t, (opt, dirs)| % dirs.each do |dir| <%=t%>: <%=dir%>/exts.mk <%=dir%>/exts.mk: FORCE $(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make='$(MAKE)' \ - --command-output=$@ $(EXTMK_ARGS) \ + --command-output=$@ $(EXTMK_ARGS) <%=opt%> \ -- subconfigure $(@D) % end % end |