mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	* template/exts.mk.tmpl: extract SUBMAKEOPTS from sub exts.mk files too. [Bug #13730]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59288 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									1d6c1d20fd
								
							
						
					
					
						commit
						2abf6a3474
					
				
					 1 changed files with 1 additions and 6 deletions
				
			
		| 
						 | 
				
			
			@ -20,7 +20,7 @@ contpat = /(?>(?>[^\\\n]|\\.)*\\\n)*(?>[^\\\n]|\\.)*/
 | 
			
		|||
Dir.glob("{ext,gems}/*/exts.mk") do |e|
 | 
			
		||||
  gem = /\Agems(?=\/)/ =~ e
 | 
			
		||||
  s = File.read(e)
 | 
			
		||||
  s.scan(/^(extensions|EXT[A-Z]+|MFLAGS|NOTE_[A-Z]+)[ \t]*=[ \t]*(#{contpat})$/o) do |n, v|
 | 
			
		||||
  s.scan(/^(extensions|SUBMAKEOPTS|EXT[A-Z]+|MFLAGS|NOTE_[A-Z]+)[ \t]*=[ \t]*(#{contpat})$/o) do |n, v|
 | 
			
		||||
    v.gsub!(/\\\n[ \t]*/, ' ')
 | 
			
		||||
    next if v.empty?
 | 
			
		||||
    next if gem and n != "extensions"
 | 
			
		||||
| 
						 | 
				
			
			@ -103,11 +103,6 @@ end
 | 
			
		|||
<%=k%> = <%=RbConfig::MAKEFILE_CONFIG[k]%>
 | 
			
		||||
% end
 | 
			
		||||
 | 
			
		||||
SUBMAKEOPTS = DLDOBJS="$(EXTOBJS) $(EXTENCS)" EXTOBJS= \
 | 
			
		||||
	      EXTSOLIBS="$(EXTLIBS)" LIBRUBY_SO_UPDATE=$(LIBRUBY_EXTS) \
 | 
			
		||||
	      EXTLDFLAGS="$(EXTLDFLAGS)" EXTINITS="$(EXTINITS)" \
 | 
			
		||||
	      UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)" SHOWFLAGS=
 | 
			
		||||
 | 
			
		||||
all:
 | 
			
		||||
static:
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue