diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-23 04:22:23 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-23 04:22:23 +0000 |
| commit | 794bbf841e3fc9ee82847171f4e9e8fc9c972f7e (patch) | |
| tree | 472573cd7596da5efe44f911aea0a5e36b5a6684 /template | |
| parent | f8c244989564be438f7cbaee7e6715f4fbe2f4fc (diff) | |
| download | ruby-794bbf841e3fc9ee82847171f4e9e8fc9c972f7e.tar.gz | |
configure-ext.mk.tmpl: embed macros
* template/configure-ext.mk.tmpl: embed MINIRUBY and SCRIPT_ARGS
to get rid of quoting problems of nmake.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57404 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'template')
| -rw-r--r-- | template/configure-ext.mk.tmpl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/template/configure-ext.mk.tmpl b/template/configure-ext.mk.tmpl index b8d4a67f7e..cf3f3b4e61 100644 --- a/template/configure-ext.mk.tmpl +++ b/template/configure-ext.mk.tmpl @@ -5,21 +5,25 @@ ECHO1 = $(V:1=@:) ECHO = $(ECHO1:0=@echo) <% -srcdir = miniruby = nil +srcdir = miniruby = script_args = nil opt = OptionParser.new do |o| o.on('--srcdir=SRCDIR') {|v| srcdir = v} o.on('--miniruby=MINIRUBY') {|v| miniruby = v} + o.on('--script-args=MINIRUBY') {|v| script_args = v} o.order!(ARGV) end srcdir ||= File.dirname(File.dirname(__FILE__)) exts = Dir.glob("#{srcdir}/ext/*/").map(&File.method(:basename)) %> +MINIRUBY = <%=miniruby%> +SCRIPT_ARGS = <%=script_args%> + all: % exts.each do |dir| all: ext/<%=dir%>/exts.mk ext/<%=dir%>/exts.mk: FORCE $(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make='$(MAKE)' --command-output=ext/<%=dir%>/exts.mk \ - --extension=<%=dir%> --extstatic $(EXTSTATIC) \ + $(SCRIPT_ARGS) --extension=<%=dir%> --extstatic $(EXTSTATIC) \ --gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \ -- subconfigure % end |