ruby-changes:28850
From: nobu <ko1@a...>
Date: Fri, 24 May 2013 00:18:39 +0900 (JST)
Subject: [ruby-changes:28850] nobu:r40902 (trunk): extmk.rb: don't duplicate
nobu 2013-05-24 00:18:05 +0900 (Fri, 24 May 2013) New Revision: 40902 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40902 Log: extmk.rb: don't duplicate * ext/extmk.rb (extract_makefile): do not add dldflags if duplicated. Modified files: trunk/ext/extmk.rb Index: ext/extmk.rb =================================================================== --- ext/extmk.rb (revision 40901) +++ ext/extmk.rb (revision 40902) @@ -105,7 +105,9 @@ def extract_makefile(makefile, keep = tr https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L105 /^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = false end $preload = Shellwords.shellwords(m[/^preload[ \t]*=[ \t]*(.*)/, 1] || "") - $DLDFLAGS += " " + (m[/^dldflags[ \t]*=[ \t]*(.*)/, 1] || "") + if dldflags = m[/^dldflags[ \t]*=[ \t]*(.*)/, 1] and !$DLDFLAGS.include?(dldflags) + $DLDFLAGS += " " + dldflags + end if s = m[/^LIBS[ \t]*=[ \t]*(.*)/, 1] s.sub!(/^#{Regexp.quote($LIBRUBYARG)} */, "") s.sub!(/ *#{Regexp.quote($LIBS)}$/, "") -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/