summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-01-23 03:51:25 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-01-23 03:51:25 +0000
commitf41b7517dcda9ecb397e82b6ba4dc9ff14a7944a (patch)
tree125f64def5e448ad95d7ae1f70c02c93969039e5 /common.mk
parentabb8fc1b17e7380c09c8749b5b4d28e5ecc3651d (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
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 74b393fa52..08bdd6bd32 100644
--- a/common.mk
+++ b/common.mk
@@ -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 \