1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for nmake

Browse Source 
* 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
This commit is contained in:
nobu 2017-01-23 03:51:25 +00:00
parent abb8fc1b17
commit f41b7517dc
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.mk
View File

@ -211,8 +211,8 @@ exts: build-ext
EXTS_MK = exts.mk EXTS_MK = exts.mk
$(EXTS_MK): ext/configure-ext.mk $(TIMESTAMPDIR)/.$(arch).time $(srcdir)/template/exts.mk.tmpl $(EXTS_MK): ext/configure-ext.mk $(TIMESTAMPDIR)/.$(arch).time $(srcdir)/template/exts.mk.tmpl
$(MAKE) -f ext/configure-ext.mk V=$(V) MINIRUBY='$(MINIRUBY)' \ $(MAKE) -f ext/configure-ext.mk V=$(V) MINIRUBY="$(MINIRUBY)" \
SCRIPT_ARGS='$(SCRIPT_ARGS)' EXTSTATIC=$(EXTSTATIC) \ EXTSTATIC=$(EXTSTATIC) \
gnumake=$(gnumake) EXTLDFLAGS="$(EXTLDFLAGS)" srcdir="$(srcdir)" gnumake=$(gnumake) EXTLDFLAGS="$(EXTLDFLAGS)" srcdir="$(srcdir)"
$(ECHO) generating makefile $@ $(ECHO) generating makefile $@
$(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \ $(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \

4
template/configure-ext.mk.tmpl
View File

@ -18,8 +18,8 @@ all:
% exts.each do |dir| % exts.each do |dir|
all: ext/<%=dir%>/exts.mk all: ext/<%=dir%>/exts.mk
ext/<%=dir%>/exts.mk: FORCE ext/<%=dir%>/exts.mk: FORCE
$(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=ext/<%=dir%>/exts.mk \ $(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make='$(MAKE)' --command-output=ext/<%=dir%>/exts.mk \
$(SCRIPT_ARGS) --extension=<%=dir%> --extstatic $(EXTSTATIC) \ --extension=<%=dir%> --extstatic $(EXTSTATIC) \
--gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \ --gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \
-- subconfigure -- subconfigure
% end % end

3
template/exts.mk.tmpl
View File

@ -71,7 +71,8 @@ SUBMAKEOPTS = DLDOBJS="$(EXTOBJS) $(EXTENCS)" EXTOBJS= \
EXTLDFLAGS="$(EXTLDFLAGS)" EXTINITS="$(EXTINITS)" \ EXTLDFLAGS="$(EXTLDFLAGS)" EXTINITS="$(EXTINITS)" \
UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)" SHOWFLAGS= UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)" SHOWFLAGS=
all static: ruby all: ruby
static: ruby
clean: clean:
-$(Q)$(RM) ext/extinit.<%= objext %> -$(Q)$(RM) ext/extinit.<%= objext %>