diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-23 03:51:25 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-23 03:51:25 +0000 |
| commit | f41b7517dcda9ecb397e82b6ba4dc9ff14a7944a (patch) | |
| tree | 125f64def5e448ad95d7ae1f70c02c93969039e5 | |
| parent | abb8fc1b17e7380c09c8749b5b4d28e5ecc3651d (diff) | |
Fix for nmake
* common.mk (EXT_MK): use double-quotes and remove SCRIPT_ARGS
which contains both types of quotes.
* template/configure-ext.mk.tmpl (all): use single-quotes for MAKE
which is set by nmake and contains spaces in the path. do not
use SCRIPT_ARGS.
* template/exts.mk.tmpl (all, static): separate dependency lines,
not to become a default target unintentionally.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57403 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | template/configure-ext.mk.tmpl | 4 | ||||
| -rw-r--r-- | template/exts.mk.tmpl | 3 |
3 files changed, 6 insertions, 5 deletions
@@ -211,8 +211,8 @@ exts: build-ext EXTS_MK = exts.mk $(EXTS_MK): ext/configure-ext.mk $(TIMESTAMPDIR)/.$(arch).time $(srcdir)/template/exts.mk.tmpl - $(MAKE) -f ext/configure-ext.mk V=$(V) MINIRUBY='$(MINIRUBY)' \ - SCRIPT_ARGS='$(SCRIPT_ARGS)' EXTSTATIC=$(EXTSTATIC) \ + $(MAKE) -f ext/configure-ext.mk V=$(V) MINIRUBY="$(MINIRUBY)" \ + EXTSTATIC=$(EXTSTATIC) \ gnumake=$(gnumake) EXTLDFLAGS="$(EXTLDFLAGS)" srcdir="$(srcdir)" $(ECHO) generating makefile $@ $(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \ diff --git a/template/configure-ext.mk.tmpl b/template/configure-ext.mk.tmpl index 622bb25551..b8d4a67f7e 100644 --- a/template/configure-ext.mk.tmpl +++ b/template/configure-ext.mk.tmpl @@ -18,8 +18,8 @@ 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 \ - $(SCRIPT_ARGS) --extension=<%=dir%> --extstatic $(EXTSTATIC) \ + $(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make='$(MAKE)' --command-output=ext/<%=dir%>/exts.mk \ + --extension=<%=dir%> --extstatic $(EXTSTATIC) \ --gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \ -- subconfigure % end diff --git a/template/exts.mk.tmpl b/template/exts.mk.tmpl index 6fadf79108..656d7fdcd1 100644 --- a/template/exts.mk.tmpl +++ b/template/exts.mk.tmpl @@ -71,7 +71,8 @@ SUBMAKEOPTS = DLDOBJS="$(EXTOBJS) $(EXTENCS)" EXTOBJS= \ EXTLDFLAGS="$(EXTLDFLAGS)" EXTINITS="$(EXTINITS)" \ UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)" SHOWFLAGS= -all static: ruby +all: ruby +static: ruby clean: -$(Q)$(RM) ext/extinit.<%= objext %> |