From 54e0b26ecf1ded39a6c2496062106e80430e488d Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 28 Nov 2007 05:43:17 +0000 Subject: * ext/extmk.rb (extract_makefile): use dldflags instead of DLDFLAGS to get rid of mixing $LDFLAGS and $ARCH_FLAG. * lib/mkmf.rb (configuration): ditto. * lib/mkmf.rb (create_makefile): support for extensions which has no shared object. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@14041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/extmk.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/extmk.rb') diff --git a/ext/extmk.rb b/ext/extmk.rb index a919381adc..06dd2f7c2c 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -79,7 +79,7 @@ def extract_makefile(makefile, keep = true) $static ||= m[/^EXTSTATIC[ \t]*=[ \t]*(\S+)/, 1] || false /^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = nil $preload = Shellwords.shellwords(m[/^preload[ \t]*=[ \t]*(.*)/, 1] || "") - $DLDFLAGS += " " + (m[/^DLDFLAGS[ \t]*=[ \t]*(.*)/, 1] || "") + $DLDFLAGS += " " + (m[/^dldflags[ \t]*=[ \t]*(.*)/, 1] || "") if s = m[/^LIBS[ \t]*=[ \t]*(.*)/, 1] s.sub!(/^#{Regexp.quote($LIBRUBYARG)} */, "") s.sub!(/ *#{Regexp.quote($LIBS)}$/, "") -- cgit v1.2.3