mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	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
This commit is contained in:
		
							parent
							
								
									abb8fc1b17
								
							
						
					
					
						commit
						f41b7517dc
					
				
					 3 changed files with 6 additions and 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 \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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 %>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue